Fix mismatched tile entities for new blocks. Fixes BUKKIT-3949

1 files changed, 16 insertions, 0 deletions

diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index a49419e4..74897635 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;