diff options
| author | md_5 <git@md-5.net> | 2016-03-10 16:34:33 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-10 16:34:33 +1100 |
| commit | 4c3da3f6e2209fa2d8417cc180db900bdba0dc2e (patch) | |
| tree | d91e11ab52c5300b002c0a5aed06e04bd2d87567 /src | |
| parent | 68b72776a9193885da46c78da560d7b6bafeba7c (diff) | |
| download | craftbukkit-4c3da3f6e2209fa2d8417cc180db900bdba0dc2e.tar craftbukkit-4c3da3f6e2209fa2d8417cc180db900bdba0dc2e.tar.gz craftbukkit-4c3da3f6e2209fa2d8417cc180db900bdba0dc2e.tar.lz craftbukkit-4c3da3f6e2209fa2d8417cc180db900bdba0dc2e.tar.xz craftbukkit-4c3da3f6e2209fa2d8417cc180db900bdba0dc2e.zip | |
SPIGOT-1862: Fix banners withj shields.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java index ce48eb55..fb706206 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java @@ -96,7 +96,7 @@ public class CraftBanner extends CraftBlockState implements Banner { @Override public boolean update(boolean force, boolean applyPhysics) { - boolean result = super.update(force, applyPhysics); + boolean result = (isPlaced()) ? super.update(force, applyPhysics) : true; if (result) { banner.color = base.getDyeData(); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java index b57b6e9d..1ee36a94 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java @@ -187,6 +187,9 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta @Override public BlockState getBlockState() { + if (blockEntityTag != null && material == Material.SHIELD) { + blockEntityTag.setString("id", "Banner"); // Hack + } TileEntity te = blockEntityTag == null ? null : TileEntity.a(MinecraftServer.getServer(), blockEntityTag); switch (material) { |