2016-06-11 08:11:51 +02:00
|
|
|
--- a/net/minecraft/server/BlockMagma.java
|
|
|
|
|
+++ b/net/minecraft/server/BlockMagma.java
|
2016-06-12 02:13:51 +02:00
|
|
|
@@ -17,7 +17,9 @@
|
2016-06-11 08:11:51 +02:00
|
|
|
|
|
|
|
|
public void stepOn(World world, BlockPosition blockposition, Entity entity) {
|
2016-12-20 21:00:00 +01:00
|
|
|
if (!entity.isFireProof() && entity instanceof EntityLiving && !EnchantmentManager.i((EntityLiving) entity)) {
|
2016-06-11 08:11:51 +02:00
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit
|
|
|
|
|
entity.damageEntity(DamageSource.HOT_FLOOR, 1.0F);
|
2016-06-12 02:13:51 +02:00
|
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
|
2016-06-11 08:11:51 +02:00
|
|
|
}
|
|
|
|
|
|
2016-06-12 02:13:51 +02:00
|
|
|
super.stepOn(world, blockposition, entity);
|
