Return to ServerWorld#saveAndFlush() method

SpongePowered · Jun 17, 2023 · e866f33 · e866f33
1 parent 91657c9
commit e866f33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/SpongeAPI b/SpongeAPI
diff --git a/.../java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerLevelMixin_API.java b/.../java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerLevelMixin_API.java
@@ -55,7 +55,6 @@
 import org.spongepowered.api.util.Ticks;
 import org.spongepowered.api.world.BlockChangeFlag;
 import org.spongepowered.api.world.SerializationBehavior;
-import org.spongepowered.api.world.WorldSaveMode;
 import org.spongepowered.api.world.border.WorldBorder;
 import org.spongepowered.api.world.chunk.WorldChunk;
 import org.spongepowered.api.world.generation.ChunkGenerator;
@@ -78,7 +77,6 @@
 import org.spongepowered.math.vector.Vector3d;
 import org.spongepowered.math.vector.Vector3i;
 
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Collections;
@@ -196,15 +194,23 @@ public Path directory() {
         return ((ServerLevelBridge) this).bridge$getLevelSave().getLevelPath(LevelResource.ROOT);
     }
 
-    @Override
-    public boolean save(final WorldSaveMode worldSaveMode) throws IOException {
+    private boolean save(final boolean flush) {
         final SerializationBehavior behavior = ((PrimaryLevelDataBridge) this.serverLevelData).bridge$serializationBehavior().orElse(SerializationBehavior.AUTOMATIC);
         ((ServerLevelBridge) this).bridge$setManualSave(true);
-        final boolean flush = worldSaveMode.equals(WorldSaveMode.SAVE_AND_FLUSH);
         this.shadow$save(null, flush, false);
         return !behavior.equals(SerializationBehavior.NONE);
     }
 
+    @Override
+    public boolean save() {
+        return save(false);
+    }
+
+    @Override
+    public boolean saveAndFlush() {
+        return save(true);
+    }
+
     @Override
     public boolean unloadChunk(final WorldChunk chunk) {
         this.shadow$unload((LevelChunk) Objects.requireNonNull(chunk, "chunk"));