Merge branch 'GeyserMC:master' into master

Shanwer · Dec 26, 2023 · 8e7934c · 8e7934c
2 parents 41e64c8 + 592a58a
commit 8e7934c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java b/...main/java/org/geysermc/geyser/platform/spigot/world/manager/GeyserSpigotWorldManager.java
@@ -197,7 +197,11 @@ public GameMode getDefaultGameMode(GeyserSession session) {
 
     @Override
     public boolean hasPermission(GeyserSession session, String permission) {
-        return Objects.requireNonNull(Bukkit.getPlayer(session.getPlayerEntity().getUsername())).hasPermission(permission);
+        Player player = Bukkit.getPlayer(session.javaUuid());
+        if (player != null) {
+            return player.hasPermission(permission);
+        }
+        return false;
     }
 
     @Override