summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockMagma.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-12-21 07:00:00 +1100
committermd_5 <git@md-5.net>2016-12-21 07:00:00 +1100
commit8ea0c87f515290c35baf0029f7b2e046c1ff49cb (patch)
tree3ac51dcfdc206a175b73ec4013bd53c423e9b6e4 /nms-patches/BlockMagma.patch
parentc8ff65136f23a3c2770b8d9ca508f61927f8acba (diff)
downloadcraftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar
craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.gz
craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.lz
craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.xz
craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.zip
Update to Minecraft 1.11.1
Diffstat (limited to 'nms-patches/BlockMagma.patch')
-rw-r--r--nms-patches/BlockMagma.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/nms-patches/BlockMagma.patch b/nms-patches/BlockMagma.patch
index 6c73106b..75f5fbad 100644
--- a/nms-patches/BlockMagma.patch
+++ b/nms-patches/BlockMagma.patch
@@ -3,7 +3,7 @@
@@ -17,7 +17,9 @@
public void stepOn(World world, BlockPosition blockposition, Entity entity) {
- if (!entity.isFireProof() && entity instanceof EntityLiving && !EnchantmentManager.j((EntityLiving) entity)) {
+ if (!entity.isFireProof() && entity instanceof EntityLiving && !EnchantmentManager.i((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