Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-05 16:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Also synchronise when loading sections forcefully

Browse Source
This commit is contained in:
dordsor21 2021-06-12 15:09:02 +01:00
parent 8836d1d75c
commit d015e6b270
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
4 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_15_2/BukkitGetBlocks_1_15_2.java
View File

@ -816,17 +816,12 @@ public class BukkitGetBlocks_1_15_2 extends CharGetBlocks implements BukkitGetBl
} }
public ChunkSection[] getSections(boolean force) { public ChunkSection[] getSections(boolean force) {
if (force && forceLoadSections) { force &= forceLoadSections;
ChunkSection[] sections = getChunk().getSections();
ChunkSection[] copy = new ChunkSection[sections.length];
System.arraycopy(sections, 0, copy, 0, sections.length);
return copy;
}
ChunkSection[] tmp = sections; ChunkSection[] tmp = sections;
if (tmp == null) { if (tmp == null || force) {
synchronized (this) { synchronized (this) {
tmp = sections; tmp = sections;
if (tmp == null) { if (tmp == null || force) {
ChunkSection[] chunkSections = getChunk().getSections(); ChunkSection[] chunkSections = getChunk().getSections();
tmp = new ChunkSection[chunkSections.length]; tmp = new ChunkSection[chunkSections.length];
System.arraycopy(chunkSections, 0, tmp, 0, chunkSections.length); System.arraycopy(chunkSections, 0, tmp, 0, chunkSections.length);

11
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitGetBlocks_1_16_1.java
View File

@ -817,17 +817,12 @@ public class BukkitGetBlocks_1_16_1 extends CharGetBlocks implements BukkitGetBl
} }
public ChunkSection[] getSections(boolean force) { public ChunkSection[] getSections(boolean force) {
if (force && forceLoadSections) { force &= forceLoadSections;
ChunkSection[] sections = getChunk().getSections();
ChunkSection[] copy = new ChunkSection[sections.length];
System.arraycopy(sections, 0, copy, 0, sections.length);
return copy;
}
ChunkSection[] tmp = sections; ChunkSection[] tmp = sections;
if (tmp == null) { if (tmp == null || force) {
synchronized (this) { synchronized (this) {
tmp = sections; tmp = sections;
if (tmp == null) { if (tmp == null || force) {
ChunkSection[] chunkSections = getChunk().getSections(); ChunkSection[] chunkSections = getChunk().getSections();
tmp = new ChunkSection[chunkSections.length]; tmp = new ChunkSection[chunkSections.length];
System.arraycopy(chunkSections, 0, tmp, 0, chunkSections.length); System.arraycopy(chunkSections, 0, tmp, 0, chunkSections.length);

11
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_2/BukkitGetBlocks_1_16_2.java
View File

@ -820,17 +820,12 @@ public class BukkitGetBlocks_1_16_2 extends CharGetBlocks implements BukkitGetBl
} }
public ChunkSection[] getSections(boolean force) { public ChunkSection[] getSections(boolean force) {
if (force && forceLoadSections) { force &= forceLoadSections;
ChunkSection[] sections = getChunk().getSections();
ChunkSection[] copy = new ChunkSection[sections.length];
System.arraycopy(sections, 0, copy, 0, sections.length);
return copy;
}
ChunkSection[] tmp = sections; ChunkSection[] tmp = sections;
if (tmp == null) { if (tmp == null || force) {
synchronized (this) { synchronized (this) {
tmp = sections; tmp = sections;
if (tmp == null) { if (tmp == null || force) {
ChunkSection[] chunkSections = getChunk().getSections(); ChunkSection[] chunkSections = getChunk().getSections();
tmp = new ChunkSection[chunkSections.length]; tmp = new ChunkSection[chunkSections.length];
System.arraycopy(chunkSections, 0, tmp, 0, chunkSections.length); System.arraycopy(chunkSections, 0, tmp, 0, chunkSections.length);

11
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_5/BukkitGetBlocks_1_16_5.java
View File

@ -820,17 +820,12 @@ public class BukkitGetBlocks_1_16_5 extends CharGetBlocks implements BukkitGetBl
} }
public ChunkSection[] getSections(boolean force) { public ChunkSection[] getSections(boolean force) {
if (force && forceLoadSections) { force &= forceLoadSections;
ChunkSection[] sections = getChunk().getSections();
ChunkSection[] copy = new ChunkSection[sections.length];
System.arraycopy(sections, 0, copy, 0, sections.length);
return copy;
}
ChunkSection[] tmp = sections; ChunkSection[] tmp = sections;
if (tmp == null) { if (tmp == null || force) {
synchronized (this) { synchronized (this) {
tmp = sections; tmp = sections;
if (tmp == null) { if (tmp == null || force) {
ChunkSection[] chunkSections = getChunk().getSections(); ChunkSection[] chunkSections = getChunk().getSections();
tmp = new ChunkSection[chunkSections.length]; tmp = new ChunkSection[chunkSections.length];
System.arraycopy(chunkSections, 0, tmp, 0, chunkSections.length); System.arraycopy(chunkSections, 0, tmp, 0, chunkSections.length);