From 09b4549a29bacf3d18ae85ce926c692cb28004af Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Wed, 2 Mar 2016 14:51:50 +0000
Subject: SPIGOT-1640: Fix spawning particles that use MaterialData

---
 src/main/java/org/bukkit/craftbukkit/CraftParticle.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftParticle.java b/src/main/java/org/bukkit/craftbukkit/CraftParticle.java
index 9c2540f2..4128e838 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftParticle.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftParticle.java
@@ -34,8 +34,7 @@ public class CraftParticle {
                 return new int[]{0};
             }
             MaterialData data = (MaterialData) obj;
-            IBlockData nms = CraftMagicNumbers.getBlock(data.getItemType()).fromLegacyData(data.getData());
-            return new int[]{Block.REGISTRY_ID.getId(nms)};
+            return new int[]{data.getItemTypeId() + ((int)(data.getData()) << 12)};
         }
         throw new IllegalArgumentException(particle.getDataType().toString());
     }
-- 
cgit v1.2.3