diff options
| author | md_5 <git@md-5.net> | 2016-06-12 10:13:51 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-06-12 10:13:51 +1000 |
| commit | fa83b1b80c0955c083150931a47a7c6d5998319e (patch) | |
| tree | 83618ec3b166736244dff78ecb41a2ad09428b97 /nms-patches/BlockMagma.patch | |
| parent | d5ecbd0e93a7a22d3631541c258635fdcc42a489 (diff) | |
| download | craftbukkit-fa83b1b80c0955c083150931a47a7c6d5998319e.tar craftbukkit-fa83b1b80c0955c083150931a47a7c6d5998319e.tar.gz craftbukkit-fa83b1b80c0955c083150931a47a7c6d5998319e.tar.lz craftbukkit-fa83b1b80c0955c083150931a47a7c6d5998319e.tar.xz craftbukkit-fa83b1b80c0955c083150931a47a7c6d5998319e.zip | |
SPIGOT-2388: Damage must be nulled out in some circumstances
Diffstat (limited to 'nms-patches/BlockMagma.patch')
| -rw-r--r-- | nms-patches/BlockMagma.patch | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nms-patches/BlockMagma.patch b/nms-patches/BlockMagma.patch index 701c36cf..6c73106b 100644 --- a/nms-patches/BlockMagma.patch +++ b/nms-patches/BlockMagma.patch @@ -1,10 +1,12 @@ --- a/net/minecraft/server/BlockMagma.java +++ b/net/minecraft/server/BlockMagma.java -@@ -17,6 +17,7 @@ +@@ -17,7 +17,9 @@ public void stepOn(World world, BlockPosition blockposition, Entity entity) { if (!entity.isFireProof() && entity instanceof EntityLiving && !EnchantmentManager.j((EntityLiving) entity)) { + org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit entity.damageEntity(DamageSource.HOT_FLOOR, 1.0F); ++ org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit } + super.stepOn(world, blockposition, entity); |