Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 12:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with chunk saving in single world plots

Browse Source
This commit is contained in:
dordsor21 2021-09-10 14:05:12 +01:00
parent 7bc76a3824
commit 4568b17c54
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
View File

@ -230,7 +230,7 @@ public class ChunkListener implements Listener {
} }
Object c = this.methodGetHandleChunk.of(chunk).call(); Object c = this.methodGetHandleChunk.of(chunk).call();
RefField.RefExecutor field = this.mustSave.of(c); RefField.RefExecutor field = this.mustSave.of(c);
if ((Boolean) field.get()) { if ((Boolean) field.get() != isTrueForNotSave) {
field.set(isTrueForNotSave); field.set(isTrueForNotSave);
if (chunk.isLoaded()) { if (chunk.isLoaded()) {
ignoreUnload = true; ignoreUnload = true;

6
Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java
View File

@ -47,7 +47,6 @@ public class SingleWorldListener implements Listener {
private final Method methodGetHandleChunk; private final Method methodGetHandleChunk;
private Field mustSave; private Field mustSave;
private boolean isTrueForNotSave = true;
public SingleWorldListener() throws Exception { public SingleWorldListener() throws Exception {
ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk"); ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
@ -57,9 +56,8 @@ public class SingleWorldListener implements Listener {
ReflectionUtils.RefClass classChunk = getRefClass("{nms}.Chunk"); ReflectionUtils.RefClass classChunk = getRefClass("{nms}.Chunk");
if (PlotSquared.platform().serverVersion()[1] == 13) { if (PlotSquared.platform().serverVersion()[1] == 13) {
this.mustSave = classChunk.getField("mustSave").getRealField(); this.mustSave = classChunk.getField("mustSave").getRealField();
this.isTrueForNotSave = false;
} else { } else {
this.mustSave = classChunk.getField("mustNotSave").getRealField(); this.mustSave = classChunk.getField("unsaved").getRealField();
} }
} else { } else {
ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk"); ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
@ -74,7 +72,7 @@ public class SingleWorldListener implements Listener {
try { try {
Object nmsChunk = methodGetHandleChunk.invoke(chunk); Object nmsChunk = methodGetHandleChunk.invoke(chunk);
if (mustSave != null) { if (mustSave != null) {
this.mustSave.set(nmsChunk, isTrueForNotSave); this.mustSave.set(nmsChunk, false);
} }
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();

4
Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotAreaManager.java
View File

@ -148,9 +148,7 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
if (found != null && found.length != 0) { if (found != null && found.length != 0) {
return found; return found;
} }
return isWorld(world) || world.equals("*") ? return isWorld(world) || world.equals("*") ? array : all.length == 0 ? noPlotAreas : found;
array :
all.length == 0 ? noPlotAreas : super.getPlotAreas(world, region);
} }
@Override @Override