Update from upstream SpigotMC

Fix timings SpigotMC/Spigot@7d79f6bf5e
Fix the particle api using the wrong Material class SpigotMC/Spigot@f5a1e7a96f
This commit is contained in:
Zach Brown
2014-08-05 13:44:19 -05:00
parent 7a921fe094
commit e7c9889883
3 changed files with 10 additions and 7 deletions

View File

@@ -78,7 +78,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ {
+ StringBuilder particleFullName = new StringBuilder();
+ particleFullName.append( effect.getName() );
+ if ( effect.getData() != null && ( effect.getData().equals( Material.class ) || effect.getData().equals( org.bukkit.material.MaterialData.class ) ) )
+ if ( effect.getData() != null && ( effect.getData().equals( org.bukkit.Material.class ) || effect.getData().equals( org.bukkit.material.MaterialData.class ) ) )
+ {
+ particleFullName.append( '_' ).append( id );
+ }