From 311f0c86a4559a96f3b2e3f2c7e63fca3be132d4 Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Sun, 31 Mar 2013 19:38:25 -0500 Subject: [PATCH] Fix mismatched tile entities for new blocks. Fixes BUKKIT-3949 --- .../java/net/minecraft/server/WorldServer.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index a49419e407..7489763554 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -88,6 +88,10 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate if (!(result instanceof TileEntityFurnace)) { result = fixTileEntity(i, j, k, type, result); } + } else if (type == Block.DROPPER.id) { + if (!(result instanceof TileEntityDropper)) { + result = fixTileEntity(i, j, k, type, result); + } } else if (type == Block.DISPENSER.id) { if (!(result instanceof TileEntityDispenser)) { result = fixTileEntity(i, j, k, type, result); @@ -112,6 +116,18 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate if (!(result instanceof TileEntityEnderChest)) { result = fixTileEntity(i, j, k, type, result); } + } else if (type == Block.BREWING_STAND.id) { + if (!(result instanceof TileEntityBrewingStand)) { + result = fixTileEntity(i, j, k, type, result); + } + } else if (type == Block.BEACON.id) { + if (!(result instanceof TileEntityBeacon)) { + result = fixTileEntity(i, j, k, type, result); + } + } else if (type == Block.HOPPER.id) { + if (!(result instanceof TileEntityHopper)) { + result = fixTileEntity(i, j, k, type, result); + } } return result;