diff options
| author | md_5 <git@md-5.net> | 2017-06-23 12:47:29 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-06-23 12:47:29 +1000 |
| commit | 5e2a23055ef8c0222b08d066ef15dad59e524d14 (patch) | |
| tree | bcd3f94bd16afafd39aee67683e2e9b033a409f5 | |
| parent | f3356f107465e2b74d353dce8f6daa49231dcc15 (diff) | |
| download | craftbukkit-5e2a23055ef8c0222b08d066ef15dad59e524d14.tar craftbukkit-5e2a23055ef8c0222b08d066ef15dad59e524d14.tar.gz craftbukkit-5e2a23055ef8c0222b08d066ef15dad59e524d14.tar.lz craftbukkit-5e2a23055ef8c0222b08d066ef15dad59e524d14.tar.xz craftbukkit-5e2a23055ef8c0222b08d066ef15dad59e524d14.zip | |
SPIGOT-3364: Correct EntityResurrectEvent
| -rw-r--r-- | nms-patches/EntityLiving.patch | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch index cd95acf5..33ec1365 100644 --- a/nms-patches/EntityLiving.patch +++ b/nms-patches/EntityLiving.patch @@ -344,12 +344,21 @@ + event.setCancelled(itemstack == null); + this.world.getServer().getPluginManager().callEvent(event); + -+ if (itemstack != null && !event.isCancelled()) { ++ if (!event.isCancelled()) { + itemstack1.subtract(1); + // CraftBukkit end if (this instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) this; +@@ -859,7 +1009,7 @@ + this.world.broadcastEntityEffect(this, (byte) 35); + } + +- return itemstack != null; ++ return !event.isCancelled(); + } + } + @@ -944,6 +1094,12 @@ boolean flag = this.lastDamageByPlayerTime > 0; |