SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Apply fda7d00747 to other versions so numpties that use old versions for no reason stop complaining too

Quellcode durchsuchen
Dieser Commit ist enthalten in:
dordsor21 2020-04-30 15:14:59 +01:00
Ursprung 508d595b8d
Commit 9869cf09c6
2 geänderte Dateien mit 20 neuen und 26 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

15
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/BukkitGetBlocks_1_14.java
Datei anzeigen

@ -206,10 +206,9 @@ public class BukkitGetBlocks_1_14 extends CharGetBlocks {
if (this.sections == null) { if (this.sections == null) {
this.sections = sections.clone(); this.sections = sections.clone();
} }
//TODO: Understand why this causes #329, what the purpose of this is, and what may or may not break after commenting this out. if (this.sections[layer] != section) {
// if (this.sections[layer] != section) { this.sections[layer] = section;
// this.sections[layer] = section; }
// }
this.blocks[layer] = arr; this.blocks[layer] = arr;
} }
} }
@ -279,20 +278,18 @@ public class BukkitGetBlocks_1_14 extends CharGetBlocks {
synchronized (this) { synchronized (this) {
synchronized (lock) { synchronized (lock) {
lock.untilFree(); lock.untilFree();
ChunkSection getSection;
if (this.nmsChunk != nmsChunk) { if (this.nmsChunk != nmsChunk) {
this.nmsChunk = nmsChunk; this.nmsChunk = nmsChunk;
this.sections = null; this.sections = null;
this.reset(); this.reset();
} else { } else if (existingSection != getSections()[layer]) {
getSection = this.getSections()[layer];
if (getSection != existingSection) {
this.sections[layer] = existingSection; this.sections[layer] = existingSection;
this.reset(); this.reset();
} else if (!Arrays.equals(update(layer, new char[4096]), load(layer))) {
this.reset(layer);
} else if (lock.isModified()) { } else if (lock.isModified()) {
this.reset(layer); this.reset(layer);
} }
}
newSection = BukkitAdapter_1_14.newChunkSection(layer, this::load, setArr); newSection = BukkitAdapter_1_14.newChunkSection(layer, this::load, setArr);
if (!BukkitAdapter_1_14.setSectionAtomic(sections, existingSection, newSection, layer)) { if (!BukkitAdapter_1_14.setSectionAtomic(sections, existingSection, newSection, layer)) {
System.out.println("Failed to set chunk section:" + X + "," + Z + " layer: " + layer); System.out.println("Failed to set chunk section:" + X + "," + Z + " layer: " + layer);

15
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_15/BukkitGetBlocks_1_15.java
Datei anzeigen

@ -214,10 +214,9 @@ public class BukkitGetBlocks_1_15 extends CharGetBlocks {
if (this.sections == null) { if (this.sections == null) {
this.sections = sections.clone(); this.sections = sections.clone();
} }
//TODO: Understand why this causes #329, what the purpose of this is, and what may or may not break after commenting this out. if (this.sections[layer] != section) {
// if (this.sections[layer] != section) { this.sections[layer] = section;
// this.sections[layer] = section; }
// }
this.blocks[layer] = arr; this.blocks[layer] = arr;
} }
} }
@ -287,20 +286,18 @@ public class BukkitGetBlocks_1_15 extends CharGetBlocks {
synchronized (this) { synchronized (this) {
synchronized (lock) { synchronized (lock) {
lock.untilFree(); lock.untilFree();
ChunkSection getSection;
if (this.nmsChunk != nmsChunk) { if (this.nmsChunk != nmsChunk) {
this.nmsChunk = nmsChunk; this.nmsChunk = nmsChunk;
this.sections = null; this.sections = null;
this.reset(); this.reset();
} else { } else if (existingSection != getSections()[layer]) {
getSection = this.getSections()[layer];
if (getSection != existingSection) {
this.sections[layer] = existingSection; this.sections[layer] = existingSection;
this.reset(); this.reset();
} else if (!Arrays.equals(update(layer, new char[4096]), load(layer))) {
this.reset(layer);
} else if (lock.isModified()) { } else if (lock.isModified()) {
this.reset(layer); this.reset(layer);
} }
}
newSection = BukkitAdapter_1_15.newChunkSection(layer, this::load, setArr); newSection = BukkitAdapter_1_15.newChunkSection(layer, this::load, setArr);
if (!BukkitAdapter_1_15.setSectionAtomic(sections, existingSection, newSection, layer)) { if (!BukkitAdapter_1_15.setSectionAtomic(sections, existingSection, newSection, layer)) {
System.out.println("Failed to set chunk section:" + X + "," + Z + " layer: " + layer); System.out.println("Failed to set chunk section:" + X + "," + Z + " layer: " + layer);