TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix NPE Potential in CraftBanner - Fixes #1337, #1336

Browse source
This commit is contained in:
Aikar 2018-08-15 08:47:34 -04:00
parent 47a42deb01
commit 0e7932315b
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Spigot-Server-Patches/0339-Fix-NPE-Potential-in-CraftBanner.patch Normal file
View file

@ -0,0 +1,22 @@
From 334b744d30a8992b3facf63bb4da6339d85345f0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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<TileEntityBanner> 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<Pattern>();
if (banner.patterns != null) {
--
2.18.0