From 0e7932315b77a90ebbfadfa0ac77463dc04d48bb Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 08:47:34 -0400 Subject: [PATCH] Fix NPE Potential in CraftBanner - Fixes #1337, #1336 --- ...339-Fix-NPE-Potential-in-CraftBanner.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Spigot-Server-Patches/0339-Fix-NPE-Potential-in-CraftBanner.patch diff --git a/Spigot-Server-Patches/0339-Fix-NPE-Potential-in-CraftBanner.patch b/Spigot-Server-Patches/0339-Fix-NPE-Potential-in-CraftBanner.patch new file mode 100644 index 000000000..dc0060e5c --- /dev/null +++ b/Spigot-Server-Patches/0339-Fix-NPE-Potential-in-CraftBanner.patch @@ -0,0 +1,22 @@ +From 334b744d30a8992b3facf63bb4da6339d85345f0 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Wed, 15 Aug 2018 08:46:20 -0400 +Subject: [PATCH] Fix NPE Potential in CraftBanner + + +diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java +index 4332a03a41..4488321017 100644 +--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java ++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java +@@ -30,7 +30,7 @@ public class CraftBanner extends CraftBlockEntityState impleme + public void load(TileEntityBanner banner) { + super.load(banner); + +- base = DyeColor.getByWoolData((byte) banner.color.getColorIndex()); ++ base = banner.color != null ? DyeColor.getByWoolData((byte) banner.color.getColorIndex()) : null; // Paper + patterns = new ArrayList(); + + if (banner.patterns != null) { +-- +2.18.0 +