move area save to world unload

TheNextLvl-net · Apr 11, 2024 · dfcb194 · dfcb194
1 parent 73c8270
commit dfcb194
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "net.thenextlvl.protect"
-version = "2.0.2-pre11"
+version = "2.0.3"
 
 java {
     withSourcesJar()

diff --git a/plugin/src/main/java/net/thenextlvl/protect/ProtectPlugin.java b/plugin/src/main/java/net/thenextlvl/protect/ProtectPlugin.java
@@ -87,11 +87,6 @@ private void registerCommands() {
         }
     }
 
-    @Override
-    public void onDisable() {
-        areaProvider().saveAreas();
-    }
-
     public class Flags {
         public final Flag<@NotNull Boolean> areaEnter = flagRegistry().register(ProtectPlugin.this, Boolean.class, "enter", true);
         public final Flag<@NotNull Boolean> areaLeave = flagRegistry().register(ProtectPlugin.this, Boolean.class, "leave", true);

diff --git a/plugin/src/main/java/net/thenextlvl/protect/area/CraftAreaProvider.java b/plugin/src/main/java/net/thenextlvl/protect/area/CraftAreaProvider.java
@@ -115,10 +115,13 @@ public FileIO<Area> loadFile(World world, @Nullable Area area, IO file) {
     }
 
     @ApiStatus.Internal
-    public void saveAreas() {
-        areas.values().stream()
-                .flatMap(Set::stream)
-                .forEach(FileIO::save);
+    public void saveAreas(World world) {
+        areas.get(world).forEach(FileIO::save);
+    }
+
+    @ApiStatus.Internal
+    public void unloadAreas(World world) {
+        areas.remove(world);
     }
 
     @ApiStatus.Internal

diff --git a/plugin/src/main/java/net/thenextlvl/protect/listener/WorldListener.java b/plugin/src/main/java/net/thenextlvl/protect/listener/WorldListener.java
@@ -14,6 +14,7 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.event.world.WorldUnloadEvent;
 
 @RequiredArgsConstructor
 public class WorldListener implements Listener {
@@ -24,6 +25,12 @@ public void onWorldLoad(WorldLoadEvent event) {
         plugin.areaProvider().loadAreas(event.getWorld());
     }
 
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onWorldUnload(WorldUnloadEvent event) {
+        plugin.areaProvider().saveAreas(event.getWorld());
+        plugin.areaProvider().unloadAreas(event.getWorld());
+    }
+
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onBlockBreak(BlockBreakEvent event) {
         event.setCancelled(!plugin.protectionService().canBreak(