Use WeakReference in ServerWorldPropertiesRegistry

Moulberry · May 26, 2024 · bcdc42f · bcdc42f
1 parent 1d2a4e8
commit bcdc42f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/com/moulberry/axiom/AxiomPaper.java b/src/main/java/com/moulberry/axiom/AxiomPaper.java
@@ -44,6 +44,7 @@
 
 import java.io.FileReader;
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
@@ -399,7 +400,7 @@ public void onGameRuleChanged(WorldGameRuleChangeEvent event) {
     }
 
     private ServerWorldPropertiesRegistry createWorldProperties(World world) {
-        ServerWorldPropertiesRegistry registry = new ServerWorldPropertiesRegistry(world);
+        ServerWorldPropertiesRegistry registry = new ServerWorldPropertiesRegistry(new WeakReference<>(world));
 
         AxiomCreateWorldPropertiesEvent createEvent = new AxiomCreateWorldPropertiesEvent(world, registry);
         Bukkit.getPluginManager().callEvent(createEvent);

diff --git a/src/main/java/com/moulberry/axiom/world_properties/server/ServerWorldPropertiesRegistry.java b/src/main/java/com/moulberry/axiom/world_properties/server/ServerWorldPropertiesRegistry.java
@@ -13,15 +13,16 @@
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
+import java.lang.ref.Reference;
 import java.util.*;
 
 public class ServerWorldPropertiesRegistry {
 
     private final LinkedHashMap<WorldPropertyCategory, List<ServerWorldPropertyHolder<?>>> propertyList = new LinkedHashMap<>();
     private final Map<ResourceLocation, ServerWorldPropertyHolder<?>> propertyMap = new HashMap<>();
-    private final World world;
+    private final Reference<World> world;
 
-    public ServerWorldPropertiesRegistry(World world) {
+    public ServerWorldPropertiesRegistry(Reference<World> world) {
         this.world = world;
         this.registerDefault();
     }
@@ -32,9 +33,14 @@ public ServerWorldPropertyHolder<?> getById(ResourceLocation resourceLocation) {
 
     @SuppressWarnings("unchecked")
     public void addCategory(WorldPropertyCategory category, List<ServerWorldPropertyBase<?>> properties) {
+        World world = this.world.get();
+        if (world == null) {
+            return;
+        }
+
         List<ServerWorldPropertyHolder<?>> holders = new ArrayList<>();
         for (ServerWorldPropertyBase<?> property : properties) {
-            Object defaultValue = property.getDefaultValue(this.world);
+            Object defaultValue = property.getDefaultValue(world);
             holders.add(new ServerWorldPropertyHolder<>(defaultValue, (ServerWorldPropertyBase<Object>) property));
         }