diff --git a/patches/server/0021-Fallback-to-Dimension-if-World-UUID-is-unknown.patch b/patches/server/0021-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
index 10b0ac1..d70bc0c 100644
--- a/patches/server/0021-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
+++ b/patches/server/0021-Fallback-to-Dimension-if-World-UUID-is-unknown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fallback to Dimension if World UUID is unknown
 
 
 diff --git a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
-index 0a8baeb94ae553c4759b065eafd9e242153cf991..f89cc1a3209b189bce1eca8131b175c8f0419525 100644
+index 0a8baeb94ae553c4759b065eafd9e242153cf991..abf8ddccce6ec9d893038d1fafdca617ce0eae4d 100644
 --- a/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
 +++ b/src/main/java/gq/bxteam/divinemc/configuration/DivineConfig.java
 @@ -152,4 +152,9 @@ public class DivineConfig {
@@ -14,23 +14,23 @@ index 0a8baeb94ae553c4759b065eafd9e242153cf991..f89cc1a3209b189bce1eca8131b175c8
      }
 +
 +    public static boolean fallbackToDimensionIfWorldUUIDUnknown = true;
-+    public static void fallbackToDimensionIfWorldUUIDUnknown() {
++    private static void fallbackToDimensionIfWorldUUIDUnknown() {
 +        fallbackToDimensionIfWorldUUIDUnknown = getBoolean("settings.fallback-to-dimension-if-world-uuid-unknown", fallbackToDimensionIfWorldUUIDUnknown);
 +    }
  }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9d96965d7940fdfe1087ce61c076001bf4d11b4a..0f0fa88a9acf465de0b9659f3ed7f89c551fe010 100644
+index 9d96965d7940fdfe1087ce61c076001bf4d11b4a..4326a21ca94322acdc114f091498967239b61e9a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -8,6 +8,7 @@ import com.mojang.authlib.GameProfile;
- import com.mojang.logging.LogUtils;
- import com.mojang.serialization.DataResult;
- import com.mojang.serialization.Dynamic;
+@@ -102,6 +102,7 @@ import net.minecraft.world.scores.PlayerTeam;
+ import net.minecraft.world.scores.Scoreboard; // Paper
+ import net.minecraft.world.scores.Team;
+ import org.slf4j.Logger;
 +import gq.bxteam.divinemc.configuration.DivineConfig;
- import io.netty.buffer.Unpooled;
- import io.papermc.paper.adventure.PaperAdventure;
- import java.io.File;
+ 
+ // CraftBukkit start
+ import java.util.stream.Collectors;
 @@ -210,7 +211,14 @@ public abstract class PlayerList {
              if (bWorld != null) {
                  resourcekey = ((CraftWorld) bWorld).getHandle().dimension();