From e0ad90304f07b4a93e328f242153aa8b2565fcc6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 10 Jun 2013 10:58:26 +1000 Subject: [PATCH] Fix missing nullcheck in particle API --- CraftBukkit-Patches/0048-Particle-API.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CraftBukkit-Patches/0048-Particle-API.patch b/CraftBukkit-Patches/0048-Particle-API.patch index 434172c08a..ba2edcdfd9 100644 --- a/CraftBukkit-Patches/0048-Particle-API.patch +++ b/CraftBukkit-Patches/0048-Particle-API.patch @@ -1,4 +1,4 @@ -From 1abe2c72cd1c12141b683cb075c483d902280b1e Mon Sep 17 00:00:00 2001 +From 461dd70b9d40f1e410a05fae349799406a3402f4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 16:14:30 +1000 Subject: [PATCH] Particle API @@ -43,7 +43,7 @@ index 7de0de5..7eca388 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index f07982d..f6646da 100644 +index f07982d..db5c3c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -887,31 +887,21 @@ public class CraftWorld implements World { @@ -109,12 +109,12 @@ index f07982d..f6646da 100644 + StringBuilder particleFullName = new StringBuilder(); + particleFullName.append( effect.getName() ); + -+ if ( effect.getData().equals( Material.class ) || effect.getData().equals( org.bukkit.material.MaterialData.class ) ) ++ if ( effect.getData() != null && effect.getData().equals( Material.class ) || effect.getData().equals( org.bukkit.material.MaterialData.class ) ) + { + particleFullName.append( '_' ).append( id ); + } + -+ if ( effect.getData().equals( org.bukkit.material.MaterialData.class ) ) ++ if ( effect.getData() != null && effect.getData().equals( org.bukkit.material.MaterialData.class ) ) + { + particleFullName.append( '_' ).append( data ); + }