From e1f296d115cfd2c517413d122990033fc1eda78d Mon Sep 17 00:00:00 2001 From: Lukas Hennig Date: Mon, 7 Aug 2017 03:30:41 +0200 Subject: [PATCH] Fix CraftBanner initialisation. --- src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java | 3 ++- .../org/bukkit/craftbukkit/block/CraftBlockEntityState.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java index f374385e91..e2c9a9b77e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java @@ -16,7 +16,7 @@ import org.bukkit.block.banner.PatternType; public class CraftBanner extends CraftBlockEntityState implements Banner { private DyeColor base; - private List patterns = new ArrayList(); + private List patterns; public CraftBanner(final Block block) { super(block, TileEntityBanner.class); @@ -31,6 +31,7 @@ public class CraftBanner extends CraftBlockEntityState impleme super.load(banner); base = DyeColor.getByDyeData((byte) banner.color.getInvColorIndex()); + patterns = new ArrayList(); if (banner.patterns != null) { for (int i = 0; i < banner.patterns.size(); i++) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java index cf94c06269..8328ed0052 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -84,7 +84,7 @@ public class CraftBlockEntityState extends CraftBlockState return snapshot.save(new NBTTagCompound()); } - // copies the data of the given tile entity data to this block state + // copies the data of the given tile entity to this block state protected void load(T tileEntity) { if (tileEntity != null && tileEntity != snapshot) { copyData(tileEntity, snapshot);