CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing nullcheck in particle API

Browse Source
This commit is contained in:
md_5 2013-06-10 10:58:26 +10:00
parent f6ecb2c9fa
commit e0ad90304f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0048-Particle-API.patch
View File

@ -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 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 16:14:30 +1000 Date: Sun, 2 Jun 2013 16:14:30 +1000
Subject: [PATCH] Particle API Subject: [PATCH] Particle API
@ -43,7 +43,7 @@ index 7de0de5..7eca388 100644
datavalue = 0; datavalue = 0;
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java 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 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/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 { @@ -887,31 +887,21 @@ public class CraftWorld implements World {
@ -109,12 +109,12 @@ index f07982d..f6646da 100644
+ StringBuilder particleFullName = new StringBuilder(); + StringBuilder particleFullName = new StringBuilder();
+ particleFullName.append( effect.getName() ); + 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 ); + 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 ); + particleFullName.append( '_' ).append( data );
+ } + }