diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
index f374385e91..e2c9a9b77e 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
@@ -16,7 +16,7 @@ import org.bukkit.block.banner.PatternType;
 public class CraftBanner extends CraftBlockEntityState<TileEntityBanner> implements Banner {
 
     private DyeColor base;
-    private List<Pattern> patterns = new ArrayList<Pattern>();
+    private List<Pattern> patterns;
 
     public CraftBanner(final Block block) {
         super(block, TileEntityBanner.class);
@@ -31,6 +31,7 @@ public class CraftBanner extends CraftBlockEntityState<TileEntityBanner> impleme
         super.load(banner);
 
         base = DyeColor.getByDyeData((byte) banner.color.getInvColorIndex());
+        patterns = new ArrayList<Pattern>();
 
         if (banner.patterns != null) {
             for (int i = 0; i < banner.patterns.size(); i++) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
index cf94c06269..8328ed0052 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -84,7 +84,7 @@ public class CraftBlockEntityState<T extends TileEntity> 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);