fix: add null check for bukkit world ref (#4443)

IntellectualSites · Jun 16, 2024 · 670f5a8 · 670f5a8
1 parent c4bd6b6
commit 670f5a8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java
@@ -75,7 +75,7 @@ private BukkitWorld(final org.bukkit.World world) {
     public static @NonNull BukkitWorld of(final org.bukkit.World world) {
         WeakReference<BukkitWorld> bukkitWorldRef = worldMap.get(world.getName());
         BukkitWorld bukkitWorld;
-        if ((bukkitWorld = bukkitWorldRef.get()) != null && world.equals(bukkitWorld.world.get())) {
+        if (bukkitWorldRef != null && (bukkitWorld = bukkitWorldRef.get()) != null && world.equals(bukkitWorld.world.get())) {
             return bukkitWorld;
         }
         bukkitWorld = new BukkitWorld(world);