diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockCactus.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockCactus.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java index 83cc09da..03eece78 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -84,17 +84,17 @@ public class BlockCactus extends Block { org.bukkit.block.Block damager = world.getWorld().getBlockAt(i, j, k); org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity(); - EntityDamageByBlockEvent event = new EntityDamageByBlockEvent(damager, damagee, org.bukkit.event.entity.EntityDamageEvent.DamageCause.CONTACT, 1); + EntityDamageByBlockEvent event = new EntityDamageByBlockEvent(damager, damagee, org.bukkit.event.entity.EntityDamageEvent.DamageCause.CONTACT, 1D); world.getServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { damagee.setLastDamageCause(event); - entity.damageEntity(DamageSource.CACTUS, event.getDamage()); + entity.damageEntity(DamageSource.CACTUS, (float) event.getDamage()); } return; } // CraftBukkit end - entity.damageEntity(DamageSource.CACTUS, 1); + entity.damageEntity(DamageSource.CACTUS, 1.0F); } } |