Bumped version and fixed LazyBlock issue.

Dieser Commit ist enthalten in:
Matthew Miller 2018-01-03 17:06:58 +10:00
Ursprung d5012bb072
Commit 3aff57d071
2 geänderte Dateien mit 9 neuen und 4 gelöschten Zeilen

Datei anzeigen

@ -35,7 +35,7 @@ buildscript {
allprojects { allprojects {
group = 'com.sk89q.worldedit' group = 'com.sk89q.worldedit'
version = '6.1.10-SNAPSHOT' version = '7.0.0-SNAPSHOT'
} }
if (!project.hasProperty("artifactory_contextUrl")) ext.artifactory_contextUrl = "http://localhost" if (!project.hasProperty("artifactory_contextUrl")) ext.artifactory_contextUrl = "http://localhost"

Datei anzeigen

@ -81,7 +81,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
*/ */
@Deprecated @Deprecated
public BaseBlock(int id) { public BaseBlock(int id) {
setId(id); internalSetId(id);
internalSetData(0); internalSetData(0);
} }
@ -104,7 +104,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
*/ */
@Deprecated @Deprecated
public BaseBlock(int id, int data) { public BaseBlock(int id, int data) {
setId(id); internalSetId(id);
internalSetData(data); internalSetData(data);
} }
@ -133,7 +133,7 @@ public class BaseBlock extends Block implements TileEntityBlock {
*/ */
@Deprecated @Deprecated
public BaseBlock(int id, int data, @Nullable CompoundTag nbtData) { public BaseBlock(int id, int data, @Nullable CompoundTag nbtData) {
setId(id); internalSetId(id);
setData(data); setData(data);
setNbtData(nbtData); setNbtData(nbtData);
} }
@ -195,6 +195,11 @@ public class BaseBlock extends Block implements TileEntityBlock {
@Override @Override
@Deprecated @Deprecated
public void setId(int id) { public void setId(int id) {
internalSetId(id);
}
@Deprecated
private void internalSetId(int id) {
BlockType type = BlockTypes.getBlockType(BundledBlockData.getInstance().fromLegacyId(id)); BlockType type = BlockTypes.getBlockType(BundledBlockData.getInstance().fromLegacyId(id));
internalSetType(type); internalSetType(type);
} }