Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-25 17:51:31 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-1862: Fix banners withj shields.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2016-03-10 16:34:33 +11:00
parent 51207b52a7
commit 45307a5099
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
View File

@ -96,7 +96,7 @@ public class CraftBanner extends CraftBlockState implements Banner {
@Override @Override
public boolean update(boolean force, boolean applyPhysics) { public boolean update(boolean force, boolean applyPhysics) {
boolean result = super.update(force, applyPhysics); boolean result = (isPlaced()) ? super.update(force, applyPhysics) : true;
if (result) { if (result) {
banner.color = base.getDyeData(); banner.color = base.getDyeData();

3
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
View File

@ -187,6 +187,9 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
@Override @Override
public BlockState getBlockState() { public BlockState getBlockState() {
if (blockEntityTag != null && material == Material.SHIELD) {
blockEntityTag.setString("id", "Banner"); // Hack
}
TileEntity te = blockEntityTag == null ? null : TileEntity.a(MinecraftServer.getServer(), blockEntityTag); TileEntity te = blockEntityTag == null ? null : TileEntity.a(MinecraftServer.getServer(), blockEntityTag);
switch (material) { switch (material) {