Remove debug + Sync sponge tile changes
This commit is contained in:
parent
97515d0f31
commit
0bac7251c1
|
@ -49,7 +49,7 @@ permissions:
|
||||||
worldedit.clipboard.rotate: true
|
worldedit.clipboard.rotate: true
|
||||||
worldedit.help: true
|
worldedit.help: true
|
||||||
worldedit.global-mask: true
|
worldedit.global-mask: true
|
||||||
worldedit.global-trasnform: true
|
worldedit.global-transform: true
|
||||||
worldedit.generation.cylinder: true
|
worldedit.generation.cylinder: true
|
||||||
worldedit.generation.sphere: true
|
worldedit.generation.sphere: true
|
||||||
worldedit.generation.forest: true
|
worldedit.generation.forest: true
|
||||||
|
|
|
@ -284,7 +284,6 @@ public class DiskOptimizedClipboard extends FaweClipboard implements Closeable {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void close() {
|
public void close() {
|
||||||
MainUtil.stacktrace();
|
|
||||||
try {
|
try {
|
||||||
if (mbb != null) {
|
if (mbb != null) {
|
||||||
mbb.force();
|
mbb.force();
|
||||||
|
|
|
@ -381,6 +381,8 @@ public class SpongeChunk_1_12 extends CharFaweChunk<Chunk, SpongeQueue_1_12> {
|
||||||
// Set tiles
|
// Set tiles
|
||||||
Map<Short, CompoundTag> tilesToSpawn = this.getTiles();
|
Map<Short, CompoundTag> tilesToSpawn = this.getTiles();
|
||||||
|
|
||||||
|
if (!tilesToSpawn.isEmpty()) {
|
||||||
|
synchronized (SpongeChunk_1_12.class) {
|
||||||
for (Map.Entry<Short, CompoundTag> entry : tilesToSpawn.entrySet()) {
|
for (Map.Entry<Short, CompoundTag> entry : tilesToSpawn.entrySet()) {
|
||||||
CompoundTag nativeTag = entry.getValue();
|
CompoundTag nativeTag = entry.getValue();
|
||||||
short blockHash = entry.getKey();
|
short blockHash = entry.getKey();
|
||||||
|
@ -397,6 +399,8 @@ public class SpongeChunk_1_12 extends CharFaweChunk<Chunk, SpongeQueue_1_12> {
|
||||||
tileEntity.readFromNBT(tag); // ReadTagIntoTile
|
tileEntity.readFromNBT(tag); // ReadTagIntoTile
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
MainUtil.handleError(e);
|
MainUtil.handleError(e);
|
||||||
}
|
}
|
||||||
|
|
|
@ -380,7 +380,8 @@ public class SpongeChunk_1_11 extends CharFaweChunk<Chunk, SpongeQueue_1_11> {
|
||||||
}
|
}
|
||||||
// Set tiles
|
// Set tiles
|
||||||
Map<Short, CompoundTag> tilesToSpawn = this.getTiles();
|
Map<Short, CompoundTag> tilesToSpawn = this.getTiles();
|
||||||
|
if (!tilesToSpawn.isEmpty()) {
|
||||||
|
synchronized (SpongeChunk_1_11.class) {
|
||||||
for (Map.Entry<Short, CompoundTag> entry : tilesToSpawn.entrySet()) {
|
for (Map.Entry<Short, CompoundTag> entry : tilesToSpawn.entrySet()) {
|
||||||
CompoundTag nativeTag = entry.getValue();
|
CompoundTag nativeTag = entry.getValue();
|
||||||
short blockHash = entry.getKey();
|
short blockHash = entry.getKey();
|
||||||
|
@ -397,6 +398,8 @@ public class SpongeChunk_1_11 extends CharFaweChunk<Chunk, SpongeQueue_1_11> {
|
||||||
tileEntity.readFromNBT(tag); // ReadTagIntoTile
|
tileEntity.readFromNBT(tag); // ReadTagIntoTile
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
MainUtil.handleError(e);
|
MainUtil.handleError(e);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue