diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2016-03-02 14:51:50 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2016-03-02 14:51:50 +0000 |
| commit | 09b4549a29bacf3d18ae85ce926c692cb28004af (patch) | |
| tree | 2e1c63becb47eca7c639a03735a95268cafbc405 /src | |
| parent | a5d4a933bce0d0635424a8db4487125f0791f0fd (diff) | |
| download | craftbukkit-09b4549a29bacf3d18ae85ce926c692cb28004af.tar craftbukkit-09b4549a29bacf3d18ae85ce926c692cb28004af.tar.gz craftbukkit-09b4549a29bacf3d18ae85ce926c692cb28004af.tar.lz craftbukkit-09b4549a29bacf3d18ae85ce926c692cb28004af.tar.xz craftbukkit-09b4549a29bacf3d18ae85ce926c692cb28004af.zip | |
SPIGOT-1640: Fix spawning particles that use MaterialData
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftParticle.java | 3 |
1 files changed, 1 insertions, 2 deletions
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()); } |