Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 04:55:47 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-4004: Fix banner pattern colouring

Browse Source
This commit is contained in:
md_5 2018-07-15 23:18:42 +10:00
parent 60185a5616
commit b8ea9ec844
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java
View File

@ -47,13 +47,13 @@ public class CraftMetaBanner extends CraftMetaItem implements BannerMeta {
NBTTagCompound entityTag = tag.getCompound("BlockEntityTag"); 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)) { if (entityTag.hasKey(PATTERNS.NBT)) {
NBTTagList patterns = entityTag.getList(PATTERNS.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND); NBTTagList patterns = entityTag.getList(PATTERNS.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND);
for (int i = 0; i < Math.min(patterns.size(), 20); i++) { for (int i = 0; i < Math.min(patterns.size(), 20); i++) {
NBTTagCompound p = patterns.getCompound(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(); NBTTagCompound entityTag = new NBTTagCompound();
if (base != null) { if (base != null) {
entityTag.setInt(BASE.NBT, base.getDyeData()); entityTag.setInt(BASE.NBT, base.getWoolData());
} }
NBTTagList newPatterns = new NBTTagList(); NBTTagList newPatterns = new NBTTagList();
for (Pattern p : patterns) { for (Pattern p : patterns) {
NBTTagCompound compound = new NBTTagCompound(); 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()); compound.setString(PATTERN.NBT, p.getPattern().getIdentifier());
newPatterns.add(compound); newPatterns.add(compound);
} }