1.4.2

Artillex-Studios · Dec 17, 2024 · 3ed5863 · 3ed5863
1 parent f746c90
commit 3ed5863
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.artillexstudios</groupId>
     <artifactId>AxAFKZone</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <packaging>jar</packaging>
 
     <name>AxAFKZone</name>

diff --git a/src/main/java/com/artillexstudios/axafkzone/AxAFKZone.java b/src/main/java/com/artillexstudios/axafkzone/AxAFKZone.java
@@ -3,6 +3,7 @@
 import com.artillexstudios.axafkzone.commands.Commands;
 import com.artillexstudios.axafkzone.libraries.Libraries;
 import com.artillexstudios.axafkzone.listeners.WandListeners;
+import com.artillexstudios.axafkzone.listeners.WorldListeners;
 import com.artillexstudios.axafkzone.schedulers.TickZones;
 import com.artillexstudios.axafkzone.utils.FileUtils;
 import com.artillexstudios.axafkzone.utils.NumberUtils;
@@ -70,6 +71,7 @@ public void enable() {
         FileUtils.loadAll();
 
         getServer().getPluginManager().registerEvents(new WandListeners(), this);
+        getServer().getPluginManager().registerEvents(new WorldListeners(), this);
 
         if (CONFIG.getBoolean("update-notifier.enabled", true)) new UpdateNotifier(this, 6598);
     }

diff --git a/src/main/java/com/artillexstudios/axafkzone/listeners/WorldListeners.java b/src/main/java/com/artillexstudios/axafkzone/listeners/WorldListeners.java
@@ -0,0 +1,34 @@
+package com.artillexstudios.axafkzone.listeners;
+
+import com.artillexstudios.axafkzone.zones.Zone;
+import com.artillexstudios.axafkzone.zones.Zones;
+import com.artillexstudios.axapi.scheduler.Scheduler;
+import org.bukkit.World;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.event.world.WorldUnloadEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class WorldListeners implements Listener {
+
+    @EventHandler
+    public void onLoad(@NotNull WorldLoadEvent event) {
+        Scheduler.get().run(scheduledTask -> {
+            for (Zone zone : Zones.getZones().values()) {
+                if (zone.getRegion().getWorld() != null) continue;
+                zone.reload();
+            }
+        });
+    }
+
+    @EventHandler
+    public void onUnload(@NotNull WorldUnloadEvent event) {
+        for (Zone zone : Zones.getZones().values()) {
+            World world = zone.getRegion().getWorld();
+            if (world != null && world.equals(event.getWorld())) {
+                zone.getRegion().setWorld(null);
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/artillexstudios/axafkzone/selection/Region.java b/src/main/java/com/artillexstudios/axafkzone/selection/Region.java
@@ -6,14 +6,16 @@
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.HashSet;
+import java.util.Set;
 
 public class Region {
     private final Location corner1;
     private final Location corner2;
     private final Location center;
-    private final World world;
+    private World world;
     private final Zone zone;
 
     public Region(Location corner1, Location corner2, @NotNull Zone zone) {
@@ -25,7 +27,8 @@ public Region(Location corner1, Location corner2, @NotNull Zone zone) {
         this.center = new Location(corner1.getWorld(), (corner1.getBlockX() + corner2.getBlockX()) / 2D, (corner1.getBlockY() + corner2.getBlockY()) / 2D, (corner1.getBlockZ() + corner2.getBlockZ()) / 2D);
     }
 
-    public HashSet<Player> getPlayersInZone() {
+    public Set<Player> getPlayersInZone() {
+        if (world == null) return Set.of();
         final HashSet<Player> players = new HashSet<>();
 
         String permission = zone.getSettings().getString("permission");
@@ -78,8 +81,12 @@ public Location getCenter() {
         return center;
     }
 
-    @NotNull
+    @Nullable
     public World getWorld() {
         return world;
     }
+
+    public void setWorld(World world) {
+        this.world = world;
+    }
 }
diff --git a/src/main/java/com/artillexstudios/axafkzone/zones/Zone.java b/src/main/java/com/artillexstudios/axafkzone/zones/Zone.java
@@ -43,7 +43,6 @@ public Zone(String name, Config settings) {
         this.name = name;
         this.settings = settings;
         this.msg = new MessageUtils(settings.getBackingDocument(), "prefix", CONFIG.getBackingDocument());
-        this.region = new Region(Serializers.LOCATION.deserialize(settings.getString("zone.location1")), Serializers.LOCATION.deserialize(settings.getString("zone.location2")), this);
         reload();
     }
 
@@ -159,6 +158,12 @@ public List<Reward> giveRewards(Player player) {
     public boolean reload() {
         if (!settings.reload()) return false;
 
+        this.region = new Region(
+                Serializers.LOCATION.deserialize(settings.getString("zone.location1")),
+                Serializers.LOCATION.deserialize(settings.getString("zone.location2")),
+                this
+        );
+
         this.rewardSeconds = settings.getInt("reward-time-seconds", 180);
         this.rollAmount = settings.getInt("roll-amount", 1);