diff --git a/build.gradle b/build.gradle index 6544aace1..000fd44ee 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ buildscript { allprojects { group = 'com.sk89q.worldedit' - version = '6.1.10-SNAPSHOT' + version = '7.0.0-SNAPSHOT' } if (!project.hasProperty("artifactory_contextUrl")) ext.artifactory_contextUrl = "http://localhost" diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java index 9a9759bb1..40f3c0f30 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java @@ -81,7 +81,7 @@ public class BaseBlock extends Block implements TileEntityBlock { */ @Deprecated public BaseBlock(int id) { - setId(id); + internalSetId(id); internalSetData(0); } @@ -104,7 +104,7 @@ public class BaseBlock extends Block implements TileEntityBlock { */ @Deprecated public BaseBlock(int id, int data) { - setId(id); + internalSetId(id); internalSetData(data); } @@ -133,7 +133,7 @@ public class BaseBlock extends Block implements TileEntityBlock { */ @Deprecated public BaseBlock(int id, int data, @Nullable CompoundTag nbtData) { - setId(id); + internalSetId(id); setData(data); setNbtData(nbtData); } @@ -195,6 +195,11 @@ public class BaseBlock extends Block implements TileEntityBlock { @Override @Deprecated public void setId(int id) { + internalSetId(id); + } + + @Deprecated + private void internalSetId(int id) { BlockType type = BlockTypes.getBlockType(BundledBlockData.getInstance().fromLegacyId(id)); internalSetType(type); }