diff options
| author | Senmori <thesenmori@gmail.com> | 2016-12-03 16:32:13 -0500 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-12-06 17:10:33 +1100 |
| commit | 8c4397207f6bbf8a0e4b80a86828c6d3f2ff4d7b (patch) | |
| tree | 1ed1bdf79a4a5fc98dd86140d04f52ead1dcf6ea | |
| parent | a710176e461fa6192521afdee74b3f9bc315065d (diff) | |
| download | craftbukkit-8c4397207f6bbf8a0e4b80a86828c6d3f2ff4d7b.tar craftbukkit-8c4397207f6bbf8a0e4b80a86828c6d3f2ff4d7b.tar.gz craftbukkit-8c4397207f6bbf8a0e4b80a86828c6d3f2ff4d7b.tar.lz craftbukkit-8c4397207f6bbf8a0e4b80a86828c6d3f2ff4d7b.tar.xz craftbukkit-8c4397207f6bbf8a0e4b80a86828c6d3f2ff4d7b.zip | |
Implement EntityDeathEvent for ArmorStands
| -rw-r--r-- | nms-patches/EntityArmorStand.patch | 84 |
1 files changed, 82 insertions, 2 deletions
diff --git a/nms-patches/EntityArmorStand.patch b/nms-patches/EntityArmorStand.patch index 2f17e36f..c2691b1b 100644 --- a/nms-patches/EntityArmorStand.patch +++ b/nms-patches/EntityArmorStand.patch @@ -38,7 +38,7 @@ if (entityhuman.abilities.canInstantlyBuild && itemstack1.isEmpty() && !itemstack.isEmpty()) { itemstack2 = itemstack.cloneItemStack(); -@@ -385,6 +409,11 @@ +@@ -385,14 +409,19 @@ } public boolean damageEntity(DamageSource damagesource, float f) { @@ -49,4 +49,84 @@ + // CraftBukkit end if (!this.world.isClientSide && !this.dead) { if (DamageSource.OUT_OF_WORLD.equals(damagesource)) { - this.die(); +- this.die(); ++ this.Q(); // CraftBukkit - this.die() -> this.Q() + return false; + } else if (!this.isInvulnerable(damagesource) && !this.bz && !this.isMarker()) { + if (damagesource.isExplosion()) { + this.G(); +- this.die(); ++ this.Q(); // CraftBukkit - this.die() -> this.Q() + return false; + } else if (DamageSource.FIRE.equals(damagesource)) { + if (this.isBurning()) { +@@ -421,7 +450,7 @@ + } else if (damagesource.u()) { + this.I(); + this.D(); +- this.die(); ++ this.Q(); // CraftBukkit - this.die() -> this.Q() + return false; + } else { + long i = this.world.getTime(); +@@ -432,7 +461,7 @@ + } else { + this.E(); + this.D(); +- this.die(); ++ this.Q(); // CraftBukkit - this.die() -> this.Q() + } + + return false; +@@ -460,19 +489,19 @@ + f1 -= f; + if (f1 <= 0.5F) { + this.G(); +- this.die(); ++ this.Q(); // CraftBukkit - this.die() -> this.Q() + } else { + this.setHealth(f1); + } + + } + +- private void E() { +- Block.a(this.world, new BlockPosition(this), new ItemStack(Items.ARMOR_STAND)); ++ private void E() { // PAIL: Rename dropLoot ++ drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(new ItemStack(Items.ARMOR_STAND))); // CraftBukkit - add to drops + this.G(); + } + +- private void G() { ++ private void G() { // PAIL: Rename dropEquippedItems + this.I(); + + int i; +@@ -481,7 +510,7 @@ + for (i = 0; i < this.bx.size(); ++i) { + itemstack = (ItemStack) this.bx.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.bx.set(i, ItemStack.a); + } + } +@@ -489,7 +518,7 @@ + for (i = 0; i < this.by.size(); ++i) { + itemstack = (ItemStack) this.by.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.by.set(i, ItemStack.a); + } + } +@@ -600,7 +629,8 @@ + return this.isSmall(); + } + +- public void Q() { ++ public void Q() { // PAIL: Rename killEntity (super) ++ org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, drops); // CraftBukkit - call event + this.die(); + } + |