geforkt von Mirrors/Paper
139 Zeilen
5.6 KiB
Diff
139 Zeilen
5.6 KiB
Diff
--- a/net/minecraft/server/EntityArmorStand.java
|
|
+++ b/net/minecraft/server/EntityArmorStand.java
|
|
@@ -5,6 +5,15 @@
|
|
import java.util.function.Predicate;
|
|
import javax.annotation.Nullable;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.inventory.EquipmentSlot;
|
|
+import org.bukkit.craftbukkit.CraftEquipmentSlot;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.entity.ArmorStand;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.player.PlayerArmorStandManipulateEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityArmorStand extends EntityLiving {
|
|
|
|
private static final Vector3f bx = new Vector3f(0.0F, 0.0F, 0.0F);
|
|
@@ -56,6 +65,13 @@
|
|
this.setPosition(d0, d1, d2);
|
|
}
|
|
|
|
+ // CraftBukkit start - SPIGOT-3607, SPIGOT-3637
|
|
+ @Override
|
|
+ public float getBukkitYaw() {
|
|
+ return this.yaw;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public final void setSize(float f, float f1) {
|
|
double d0 = this.locX;
|
|
double d1 = this.locY;
|
|
@@ -357,6 +373,21 @@
|
|
if (itemstack1.isEmpty() || (this.bH & 1 << enumitemslot.c() + 8) == 0) {
|
|
if (!itemstack1.isEmpty() || (this.bH & 1 << enumitemslot.c() + 16) == 0) {
|
|
ItemStack itemstack2;
|
|
+ // CraftBukkit start
|
|
+ org.bukkit.inventory.ItemStack armorStandItem = CraftItemStack.asCraftMirror(itemstack1);
|
|
+ org.bukkit.inventory.ItemStack playerHeldItem = CraftItemStack.asCraftMirror(itemstack);
|
|
+
|
|
+ Player player = (Player) entityhuman.getBukkitEntity();
|
|
+ ArmorStand self = (ArmorStand) this.getBukkitEntity();
|
|
+
|
|
+ EquipmentSlot slot = CraftEquipmentSlot.getSlot(enumitemslot);
|
|
+ PlayerArmorStandManipulateEvent armorStandManipulateEvent = new PlayerArmorStandManipulateEvent(player,self,playerHeldItem,armorStandItem,slot);
|
|
+ this.world.getServer().getPluginManager().callEvent(armorStandManipulateEvent);
|
|
+
|
|
+ if (armorStandManipulateEvent.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
if (entityhuman.abilities.canInstantlyBuild && itemstack1.isEmpty() && !itemstack.isEmpty()) {
|
|
itemstack2 = itemstack.cloneItemStack();
|
|
@@ -378,14 +409,19 @@
|
|
}
|
|
|
|
public boolean damageEntity(DamageSource damagesource, float f) {
|
|
+ // CraftBukkit start
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (!this.world.isClientSide && !this.dead) {
|
|
if (DamageSource.OUT_OF_WORLD.equals(damagesource)) {
|
|
- this.die();
|
|
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
|
|
return false;
|
|
} else if (!this.isInvulnerable(damagesource) && !this.bG && !this.isMarker()) {
|
|
if (damagesource.isExplosion()) {
|
|
this.D();
|
|
- this.die();
|
|
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
|
|
return false;
|
|
} else if (DamageSource.FIRE.equals(damagesource)) {
|
|
if (this.isBurning()) {
|
|
@@ -409,7 +445,7 @@
|
|
} else if (damagesource.v()) {
|
|
this.F();
|
|
this.A();
|
|
- this.die();
|
|
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
|
|
return false;
|
|
} else {
|
|
long i = this.world.getTime();
|
|
@@ -420,7 +456,7 @@
|
|
} else {
|
|
this.B();
|
|
this.A();
|
|
- this.die();
|
|
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
|
|
}
|
|
|
|
return true;
|
|
@@ -447,7 +483,7 @@
|
|
f1 -= f;
|
|
if (f1 <= 0.5F) {
|
|
this.D();
|
|
- this.die();
|
|
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
|
|
} else {
|
|
this.setHealth(f1);
|
|
}
|
|
@@ -455,7 +491,7 @@
|
|
}
|
|
|
|
private void B() {
|
|
- Block.a(this.world, new BlockPosition(this), new ItemStack(Items.ARMOR_STAND));
|
|
+ drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(new ItemStack(Items.ARMOR_STAND))); // CraftBukkit - add to drops
|
|
this.D();
|
|
}
|
|
|
|
@@ -468,7 +504,7 @@
|
|
for (i = 0; i < this.bE.size(); ++i) {
|
|
itemstack = (ItemStack) this.bE.get(i);
|
|
if (!itemstack.isEmpty()) {
|
|
- Block.a(this.world, (new BlockPosition(this)).up(), itemstack);
|
|
+ drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemstack)); // CraftBukkit - add to drops
|
|
this.bE.set(i, ItemStack.a);
|
|
}
|
|
}
|
|
@@ -476,7 +512,7 @@
|
|
for (i = 0; i < this.bF.size(); ++i) {
|
|
itemstack = (ItemStack) this.bF.get(i);
|
|
if (!itemstack.isEmpty()) {
|
|
- Block.a(this.world, (new BlockPosition(this)).up(), itemstack);
|
|
+ drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemstack)); // CraftBukkit - add to drops
|
|
this.bF.set(i, ItemStack.a);
|
|
}
|
|
}
|
|
@@ -588,6 +624,7 @@
|
|
}
|
|
|
|
public void killEntity() {
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, drops); // CraftBukkit - call event
|
|
this.die();
|
|
}
|
|
|