summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2013-03-31 19:38:25 -0500
committerTravis Watkins <amaranth@ubuntu.com>2013-03-31 19:38:25 -0500
commit311f0c86a4559a96f3b2e3f2c7e63fca3be132d4 (patch)
tree2369fe6a84d4e36fd947dabb3b904cebe8393d62 /src
parent71a475f0764c459dffbcbc32db36953b18a67afa (diff)
downloadcraftbukkit-311f0c86a4559a96f3b2e3f2c7e63fca3be132d4.tar
craftbukkit-311f0c86a4559a96f3b2e3f2c7e63fca3be132d4.tar.gz
craftbukkit-311f0c86a4559a96f3b2e3f2c7e63fca3be132d4.tar.lz
craftbukkit-311f0c86a4559a96f3b2e3f2c7e63fca3be132d4.tar.xz
craftbukkit-311f0c86a4559a96f3b2e3f2c7e63fca3be132d4.zip
Fix mismatched tile entities for new blocks. Fixes BUKKIT-3949
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/WorldServer.java16
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;