diff options
| author | GJ <gjmcferrin@gmail.com> | 2014-02-06 08:34:07 -0500 |
|---|---|---|
| committer | Travis Watkins <amaranth@ubuntu.com> | 2014-04-18 10:18:52 -0500 |
| commit | 2a2cdd48857a2985a4e0988a63dfd598d0f60860 (patch) | |
| tree | 7d9e473c495b923e3acc7c1e8e1e661518142aee /src/main | |
| parent | 0a179711aaadabd5974ad23401e0c07210b87cc6 (diff) | |
| download | craftbukkit-2a2cdd48857a2985a4e0988a63dfd598d0f60860.tar craftbukkit-2a2cdd48857a2985a4e0988a63dfd598d0f60860.tar.gz craftbukkit-2a2cdd48857a2985a4e0988a63dfd598d0f60860.tar.lz craftbukkit-2a2cdd48857a2985a4e0988a63dfd598d0f60860.tar.xz craftbukkit-2a2cdd48857a2985a4e0988a63dfd598d0f60860.zip | |
[Bleeding] Ice in the nether fades to air. Fixes BUKKIT-5373
Previously, whenever BlockFadeEvent was called for ice melting, it returned
the new BlockState with a type of Material.STATIONARY_WATER. However, in
the Nether, ice melting does not form water, but is simply replaced by air
instead. This changes the event to use the proper BlockState based on
whether the block is located in the Nether or not.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockIce.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/BlockIce.java b/src/main/java/net/minecraft/server/BlockIce.java index c0213b66..f55aa64f 100644 --- a/src/main/java/net/minecraft/server/BlockIce.java +++ b/src/main/java/net/minecraft/server/BlockIce.java @@ -44,7 +44,7 @@ public class BlockIce extends BlockHalfTransparent { public void a(World world, int i, int j, int k, Random random) { if (world.b(EnumSkyBlock.BLOCK, i, j, k) > 11 - this.k()) { // CraftBukkit start - if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world.getWorld().getBlockAt(i, j, k), Blocks.STATIONARY_WATER).isCancelled()) { + if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world.getWorld().getBlockAt(i, j, k), world.worldProvider.f ? Blocks.AIR : Blocks.STATIONARY_WATER).isCancelled()) { return; } // CraftBukkit end |