summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-18 09:53:50 +1000
committermd_5 <git@md-5.net>2018-07-18 09:53:50 +1000
commit3791cf947ec9dcd7918049a8c23b09e74fca054e (patch)
tree2beffe4518d4a26cdd0705c29fd51d2f76dd1445 /src/main/java
parent404d6e776e39f00f7466467600459189a6800870 (diff)
downloadcraftbukkit-3791cf947ec9dcd7918049a8c23b09e74fca054e.tar
craftbukkit-3791cf947ec9dcd7918049a8c23b09e74fca054e.tar.gz
craftbukkit-3791cf947ec9dcd7918049a8c23b09e74fca054e.tar.lz
craftbukkit-3791cf947ec9dcd7918049a8c23b09e74fca054e.tar.xz
craftbukkit-3791cf947ec9dcd7918049a8c23b09e74fca054e.zip
SPIGOT-4037: Improve legacy BlockState.setData
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
index 08f73c8f..9e745e57 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
@@ -20,6 +20,7 @@ import org.bukkit.plugin.Plugin;
import java.util.List;
import net.minecraft.server.GeneratorAccess;
import net.minecraft.server.IBlockData;
+import org.bukkit.craftbukkit.util.CraftLegacy;
public class CraftBlockState implements BlockState {
private final CraftWorld world;
@@ -101,7 +102,7 @@ public class CraftBlockState implements BlockState {
}
public void setData(final MaterialData data) {
- Material mat = getType();
+ Material mat = CraftMagicNumbers.getMaterial(this.data).getItemType();
if ((mat == null) || (mat.getData() == null)) {
this.data = CraftMagicNumbers.getBlock(data);