diff options
author | md_5 <git@md-5.net> | 2018-07-15 23:18:42 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2018-07-15 23:30:00 +1000 |
commit | b8ea9ec8447a42d8e2c04c17727618aaa242894b (patch) | |
tree | 9474c9e758e366a94e233693d6d842f2cb8e50a4 /src/main/java/org | |
parent | 60185a56161468420f23e9c7b0694381546e67b7 (diff) | |
download | craftbukkit-b8ea9ec8447a42d8e2c04c17727618aaa242894b.tar craftbukkit-b8ea9ec8447a42d8e2c04c17727618aaa242894b.tar.gz craftbukkit-b8ea9ec8447a42d8e2c04c17727618aaa242894b.tar.lz craftbukkit-b8ea9ec8447a42d8e2c04c17727618aaa242894b.tar.xz craftbukkit-b8ea9ec8447a42d8e2c04c17727618aaa242894b.zip |
SPIGOT-4004: Fix banner pattern colouring
Diffstat (limited to 'src/main/java/org')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java index 4d1cc88a..62c923e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java @@ -47,13 +47,13 @@ public class CraftMetaBanner extends CraftMetaItem implements BannerMeta { NBTTagCompound entityTag = tag.getCompound("BlockEntityTag"); - base = entityTag.hasKey(BASE.NBT) ? DyeColor.getByDyeData((byte) entityTag.getInt(BASE.NBT)) : null; + base = entityTag.hasKey(BASE.NBT) ? DyeColor.getByWoolData((byte) entityTag.getInt(BASE.NBT)) : null; if (entityTag.hasKey(PATTERNS.NBT)) { NBTTagList patterns = entityTag.getList(PATTERNS.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND); for (int i = 0; i < Math.min(patterns.size(), 20); i++) { NBTTagCompound p = patterns.getCompound(i); - this.patterns.add(new Pattern(DyeColor.getByDyeData((byte) p.getInt(COLOR.NBT)), PatternType.getByIdentifier(p.getString(PATTERN.NBT)))); + this.patterns.add(new Pattern(DyeColor.getByWoolData((byte) p.getInt(COLOR.NBT)), PatternType.getByIdentifier(p.getString(PATTERN.NBT)))); } } } @@ -84,14 +84,14 @@ public class CraftMetaBanner extends CraftMetaItem implements BannerMeta { NBTTagCompound entityTag = new NBTTagCompound(); if (base != null) { - entityTag.setInt(BASE.NBT, base.getDyeData()); + entityTag.setInt(BASE.NBT, base.getWoolData()); } NBTTagList newPatterns = new NBTTagList(); for (Pattern p : patterns) { NBTTagCompound compound = new NBTTagCompound(); - compound.setInt(COLOR.NBT, p.getColor().getDyeData()); + compound.setInt(COLOR.NBT, p.getColor().getWoolData()); compound.setString(PATTERN.NBT, p.getPattern().getIdentifier()); newPatterns.add(compound); } |