Fix posibiility of aquireing an uninitialized player object

TBlueF · TBlueF · commit e6e5e7844205 · 2025-04-06T18:02:59.000+02:00
diff --git a/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
@@ -182,7 +182,7 @@ public Optional<ServerWorld> getServerWorld(Object world) {
     }
 
     public ServerWorld getServerWorld(net.minecraft.server.world.ServerWorld serverWorld) {
-        return worlds.get(serverWorld);
+        return worlds.get(Objects.requireNonNull(serverWorld));
     }
 
     @Override
diff --git a/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java b/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java
@@ -134,7 +134,7 @@ public void update() {
         update(player);
     }
 
-    public void update(ServerPlayerEntity player) {
+    private void update(ServerPlayerEntity player) {
         this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameMode());
         if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
 
@@ -148,10 +148,12 @@ public void update(ServerPlayerEntity player) {
         this.rotation = new Vector3d(player.getPitch(), player.getHeadYaw(), 0);
         this.sneaking = player.isSneaking();
 
-        this.skyLight = player.getWorld().getLightingProvider().get(LightType.SKY).getLightLevel(player.getBlockPos());
-        this.blockLight = player.getWorld().getLightingProvider().get(LightType.BLOCK).getLightLevel(player.getBlockPos());
+        net.minecraft.server.world.ServerWorld world = player.getServerWorld();
 
-        this.world = mod.getServerWorld(player.getServerWorld());
+        this.skyLight = world.getLightingProvider().get(LightType.SKY).getLightLevel(player.getBlockPos());
+        this.blockLight = world.getLightingProvider().get(LightType.BLOCK).getLightLevel(player.getBlockPos());
+
+        this.world = mod.getServerWorld(world);
     }
 
 }
diff --git a/implementations/forge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
@@ -196,7 +196,7 @@ public Optional<ServerWorld> getServerWorld(Object world) {
     }
 
     public ServerWorld getServerWorld(ServerLevel world) {
-        return worlds.get(world);
+        return worlds.get(Objects.requireNonNull(world));
     }
 
     @Override
@@ -211,10 +211,9 @@ public Optional<Path> getModsFolder() {
 
     @SubscribeEvent
     public void onPlayerJoin(PlayerLoggedInEvent evt) {
-        var playerInstance = evt.getEntity();
-        if (!(playerInstance instanceof ServerPlayer)) return;
+        if (!(evt.getEntity() instanceof ServerPlayer serverPlayer)) return;
 
-        ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this);
+        ForgePlayer player = new ForgePlayer(serverPlayer, this);
         onlinePlayerMap.put(player.getUuid(), player);
         onlinePlayerList.add(player);
     }
diff --git a/implementations/forge/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java b/implementations/forge/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java
@@ -31,6 +31,7 @@
 import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
@@ -65,11 +66,11 @@ public class ForgePlayer extends Player {
 
     private final ForgeMod mod;
 
-    public ForgePlayer(UUID playerUuid, ForgeMod mod) {
-        this.uuid = playerUuid;
+    public ForgePlayer(ServerPlayer player, ForgeMod mod) {
+        this.uuid = player.getUUID();
         this.mod = mod;
 
-        update();
+        update(player);
     }
 
     @Override
@@ -132,6 +133,10 @@ public void update() {
         ServerPlayer player = server.getPlayerList().getPlayer(uuid);
         if (player == null) return;
 
+        update(player);
+    }
+
+    private void update(ServerPlayer player) {
         this.gamemode = GAMEMODE_MAP.getOrDefault(player.gameMode.getGameModeForPlayer(), Gamemode.SURVIVAL);
         if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
 
@@ -145,10 +150,12 @@ public void update() {
         this.rotation = new Vector3d(player.getXRot(), player.getYHeadRot(), 0);
         this.sneaking = player.isCrouching();
 
-        this.skyLight = player.level().getChunkSource().getLightEngine().getLayerListener(LightLayer.SKY).getLightValue(new BlockPos(player.getBlockX(), player.getBlockY(), player.getBlockZ()));
-        this.blockLight = player.level().getChunkSource().getLightEngine().getLayerListener(LightLayer.BLOCK).getLightValue(new BlockPos(player.getBlockX(), player.getBlockY(), player.getBlockZ()));
+        ServerLevel world = player.serverLevel();
+
+        this.skyLight = world.getChunkSource().getLightEngine().getLayerListener(LightLayer.SKY).getLightValue(new BlockPos(player.getBlockX(), player.getBlockY(), player.getBlockZ()));
+        this.blockLight = world.getChunkSource().getLightEngine().getLayerListener(LightLayer.BLOCK).getLightValue(new BlockPos(player.getBlockX(), player.getBlockY(), player.getBlockZ()));
 
-        this.world = mod.getServerWorld(player.serverLevel());
+        this.world = mod.getServerWorld(world);
     }
 
 }
diff --git a/implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
@@ -177,14 +177,14 @@ public Optional<ServerWorld> getServerWorld(Object world) {
             } catch (ClassCastException ignored) {}
         }
 
-        if (world instanceof ServerLevel)
-            return Optional.of(getServerWorld((ServerLevel) world));
+        if (world instanceof ServerLevel serverLevel)
+            return Optional.of(getServerWorld(serverLevel));
 
         return Optional.empty();
     }
 
     public ServerWorld getServerWorld(ServerLevel world) {
-        return worlds.get(world);
+        return worlds.get(Objects.requireNonNull(world));
     }
 
     @Override
@@ -199,19 +199,15 @@ public Optional<Path> getModsFolder() {
 
     @SubscribeEvent
     public void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent evt) {
-        var playerInstance = evt.getEntity();
-        if (!(playerInstance instanceof ServerPlayer)) return;
-
-        ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this);
+        if (!(evt.getEntity() instanceof ServerPlayer serverPlayer)) return;
+        ForgePlayer player = new ForgePlayer(serverPlayer, this);
         onlinePlayerMap.put(player.getUuid(), player);
         onlinePlayerList.add(player);
     }
 
     @SubscribeEvent
     public void onPlayerLeave(PlayerEvent.PlayerLoggedOutEvent evt) {
         var player = evt.getEntity();
-        if (!(player instanceof ServerPlayer)) return;
-
         UUID playerUUID = player.getUUID();
         onlinePlayerMap.remove(playerUUID);
         synchronized (onlinePlayerList) {
diff --git a/implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java b/implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java
@@ -31,6 +31,7 @@
 import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
@@ -65,11 +66,11 @@ public class ForgePlayer extends Player {
 
     private final ForgeMod mod;
 
-    public ForgePlayer(UUID playerUuid, ForgeMod mod) {
-        this.uuid = playerUuid;
+    public ForgePlayer(ServerPlayer player, ForgeMod mod) {
+        this.uuid = player.getUUID();
         this.mod = mod;
 
-        update();
+        update(player);
     }
 
     @Override
@@ -132,6 +133,10 @@ public void update() {
         ServerPlayer player = server.getPlayerList().getPlayer(uuid);
         if (player == null) return;
 
+        update(player);
+    }
+
+    private void update(ServerPlayer player) {
         this.gamemode = GAMEMODE_MAP.getOrDefault(player.gameMode.getGameModeForPlayer(), Gamemode.SURVIVAL);
         if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
 
@@ -145,10 +150,12 @@ public void update() {
         this.rotation = new Vector3d(player.getXRot(), player.getYHeadRot(), 0);
         this.sneaking = player.isCrouching();
 
-        this.skyLight = player.level().getChunkSource().getLightEngine().getLayerListener(LightLayer.SKY).getLightValue(new BlockPos(player.getBlockX(), player.getBlockY(), player.getBlockZ()));
-        this.blockLight = player.level().getChunkSource().getLightEngine().getLayerListener(LightLayer.BLOCK).getLightValue(new BlockPos(player.getBlockX(), player.getBlockY(), player.getBlockZ()));
+        ServerLevel world = player.serverLevel();
+
+        this.skyLight = world.getChunkSource().getLightEngine().getLayerListener(LightLayer.SKY).getLightValue(new BlockPos(player.getBlockX(), player.getBlockY(), player.getBlockZ()));
+        this.blockLight = world.getChunkSource().getLightEngine().getLayerListener(LightLayer.BLOCK).getLightValue(new BlockPos(player.getBlockX(), player.getBlockY(), player.getBlockZ()));
 
-        this.world = mod.getServerWorld(player.serverLevel());
+        this.world = mod.getServerWorld(world);
     }
 
 }
diff --git a/implementations/paper/src/main/java/de/bluecolored/bluemap/bukkit/BukkitCommandSource.java b/implementations/paper/src/main/java/de/bluecolored/bluemap/bukkit/BukkitCommandSource.java
@@ -30,6 +30,7 @@
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.command.ConsoleCommandSender;
 
 import java.util.Optional;
@@ -65,8 +66,9 @@ public Optional<Vector3d> getPosition() {
     public Optional<ServerWorld> getWorld() {
         if (delegate.getSender() instanceof ConsoleCommandSender) return Optional.empty();
 
-        ServerWorld serverWorld = BukkitPlugin.getInstance().getServerWorld(delegate.getLocation().getWorld());
-        return Optional.ofNullable(serverWorld);
+        World world = delegate.getLocation().getWorld();
+        if (world == null) return Optional.empty();
+        return Optional.of(BukkitPlugin.getInstance().getServerWorld(world));
     }
 
 }
diff --git a/implementations/paper/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayer.java b/implementations/paper/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayer.java
@@ -61,9 +61,9 @@ public class BukkitPlayer extends Player {
     private boolean vanished;
     private Gamemode gamemode;
 
-    public BukkitPlayer(UUID playerUUID) {
-        this.uuid = playerUUID;
-        update();
+    public BukkitPlayer(org.bukkit.entity.Player player) {
+        this.uuid = player.getUniqueId();
+        update(player);
     }
 
     @Override
@@ -128,6 +128,10 @@ public void update() {
         org.bukkit.entity.Player player = Bukkit.getPlayer(uuid);
         if (player == null) return;
 
+        update(player);
+    }
+
+    private void update(org.bukkit.entity.Player player) {
         this.gamemode = GAMEMODE_MAP.get(player.getGameMode());
         if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
 
diff --git a/implementations/paper/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java b/implementations/paper/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java
@@ -201,7 +201,7 @@ public Optional<ServerWorld> getServerWorld(Object world) {
     }
 
     public ServerWorld getServerWorld(World world) {
-        return worlds.get(world);
+        return worlds.get(Objects.requireNonNull(world));
     }
 
     @Override
@@ -242,15 +242,15 @@ public Collection<Player> getOnlinePlayers() {
     }
 
     private void initPlayer(org.bukkit.entity.Player bukkitPlayer) {
-        BukkitPlayer player = new BukkitPlayer(bukkitPlayer.getUniqueId());
+        BukkitPlayer player = new BukkitPlayer(bukkitPlayer);
         onlinePlayerMap.put(bukkitPlayer.getUniqueId(), player);
         onlinePlayerList.add(player);
 
         // update player every 20 seconds
         scheduledTasks.add(
             bukkitPlayer.getScheduler().runAtFixedRate(this, task -> {
                 player.update();
-            }, () -> {}, 20, 20)
+            }, null, 20, 20)
         );
     }
 
diff --git a/implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitCommandSource.java b/implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitCommandSource.java
@@ -32,6 +32,7 @@
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.md_5.bungee.chat.ComponentSerializer;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
@@ -75,8 +76,9 @@ public Optional<ServerWorld> getWorld() {
         Location location = getLocation();
 
         if (location != null) {
-            ServerWorld serverWorld = BukkitPlugin.getInstance().getServerWorld(location.getWorld());
-            return Optional.ofNullable(serverWorld);
+            World world = location.getWorld();
+            if (world == null) return Optional.empty();
+            return Optional.of(BukkitPlugin.getInstance().getServerWorld(world));
         }
 
         return Optional.empty();
diff --git a/implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayer.java b/implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayer.java
@@ -61,9 +61,9 @@ public class BukkitPlayer extends Player {
     private boolean vanished;
     private Gamemode gamemode;
 
-    public BukkitPlayer(UUID playerUUID) {
-        this.uuid = playerUUID;
-        update();
+    public BukkitPlayer(org.bukkit.entity.Player player) {
+        this.uuid = player.getUniqueId();
+        update(player);
     }
 
     @Override
@@ -128,6 +128,10 @@ public void update() {
         org.bukkit.entity.Player player = Bukkit.getPlayer(uuid);
         if (player == null) return;
 
+        update(player);
+    }
+
+    private void update(org.bukkit.entity.Player player) {
         this.gamemode = GAMEMODE_MAP.get(player.getGameMode());
         if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
 
diff --git a/implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java b/implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java
@@ -141,7 +141,7 @@ public void onEnable() {
         this.onlinePlayerList.clear();
         this.onlinePlayerMap.clear();
         for (org.bukkit.entity.Player player : getServer().getOnlinePlayers()) {
-            BukkitPlayer bukkitPlayer = new BukkitPlayer(player.getUniqueId());
+            BukkitPlayer bukkitPlayer = new BukkitPlayer(player);
             onlinePlayerMap.put(player.getUniqueId(), bukkitPlayer);
             onlinePlayerList.add(bukkitPlayer);
         }
@@ -222,7 +222,7 @@ public Optional<ServerWorld> getServerWorld(Object world) {
     }
 
     public ServerWorld getServerWorld(World world) {
-        return worlds.get(world);
+        return worlds.get(Objects.requireNonNull(world));
     }
 
     @Override
@@ -245,7 +245,7 @@ public static BukkitPlugin getInstance() {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerJoin(PlayerJoinEvent evt) {
-        BukkitPlayer player = new BukkitPlayer(evt.getPlayer().getUniqueId());
+        BukkitPlayer player = new BukkitPlayer(evt.getPlayer());
         onlinePlayerMap.put(evt.getPlayer().getUniqueId(), player);
         onlinePlayerList.add(player);
     }
diff --git a/implementations/sponge/src/main/java/de/bluecolored/bluemap/sponge/SpongeCommandSource.java b/implementations/sponge/src/main/java/de/bluecolored/bluemap/sponge/SpongeCommandSource.java
@@ -67,8 +67,11 @@ public Optional<Vector3d> getPosition() {
 
     @Override
     public Optional<ServerWorld> getWorld() {
-        if (audience instanceof Locatable locatable)
-            return Optional.ofNullable(SpongePlugin.getInstance().getServerWorld(locatable.serverLocation().world()));
+        if (audience instanceof Locatable locatable) {
+            org.spongepowered.api.world.server.ServerWorld world = locatable.serverLocation().world();
+            if (world == null) return Optional.empty();
+            return Optional.of(SpongePlugin.getInstance().getServerWorld(world));
+        }
         return Optional.empty();
     }
 
diff --git a/implementations/sponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java b/implementations/sponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java
@@ -63,9 +63,9 @@ public class SpongePlayer extends Player {
     private boolean vanished;
     private Gamemode gamemode;
 
-    public SpongePlayer(UUID playerUUID) {
-        this.uuid = playerUUID;
-        update();
+    public SpongePlayer(ServerPlayer player) {
+        this.uuid = player.uniqueId();
+        update(player);
     }
 
     @Override
@@ -130,6 +130,10 @@ public void update() {
         ServerPlayer player = Sponge.server().player(uuid).orElse(null);
         if (player == null) return;
 
+        update(player);
+    }
+
+    private void update(ServerPlayer player) {
         this.gamemode = GAMEMODE_MAP.get(player.gameMode().get());
         if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
 
diff --git a/implementations/sponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java b/implementations/sponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public Optional<ServerWorld> getServerWorld(Object world) {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`public ServerWorld getServerWorld(net.minecraft.server.world.ServerWorld serverWorld) {`
`185`		`- return worlds.get(serverWorld);`
	`185`	`+ return worlds.get(Objects.requireNonNull(serverWorld));`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public void update() {`
`134`	`134`	`update(player);`
`135`	`135`	`}`
`136`	`136`
`137`		`- public void update(ServerPlayerEntity player) {`
	`137`	`+ private void update(ServerPlayerEntity player) {`
`138`	`138`	`this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameMode());`
`139`	`139`	`if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;`
`140`	`140`
`@@ -148,10 +148,12 @@ public void update(ServerPlayerEntity player) {`
`148`	`148`	`this.rotation = new Vector3d(player.getPitch(), player.getHeadYaw(), 0);`
`149`	`149`	`this.sneaking = player.isSneaking();`
`150`	`150`
`151`		`- this.skyLight = player.getWorld().getLightingProvider().get(LightType.SKY).getLightLevel(player.getBlockPos());`
`152`		`- this.blockLight = player.getWorld().getLightingProvider().get(LightType.BLOCK).getLightLevel(player.getBlockPos());`
	`151`	`+ net.minecraft.server.world.ServerWorld world = player.getServerWorld();`
`153`	`152`
`154`		`- this.world = mod.getServerWorld(player.getServerWorld());`
	`153`	`+ this.skyLight = world.getLightingProvider().get(LightType.SKY).getLightLevel(player.getBlockPos());`
	`154`	`+ this.blockLight = world.getLightingProvider().get(LightType.BLOCK).getLightLevel(player.getBlockPos());`
	`155`	`+`
	`156`	`+ this.world = mod.getServerWorld(world);`
`155`	`157`	`}`
`156`	`158`
`157`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public Optional<ServerWorld> getServerWorld(Object world) {`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`public ServerWorld getServerWorld(ServerLevel world) {`
`199`		`- return worlds.get(world);`
	`199`	`+ return worlds.get(Objects.requireNonNull(world));`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`@Override`
`@@ -211,10 +211,9 @@ public Optional<Path> getModsFolder() {`
`211`	`211`
`212`	`212`	`@SubscribeEvent`
`213`	`213`	`public void onPlayerJoin(PlayerLoggedInEvent evt) {`
`214`		`- var playerInstance = evt.getEntity();`
`215`		`- if (!(playerInstance instanceof ServerPlayer)) return;`
	`214`	`+ if (!(evt.getEntity() instanceof ServerPlayer serverPlayer)) return;`
`216`	`215`
`217`		`- ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this);`
	`216`	`+ ForgePlayer player = new ForgePlayer(serverPlayer, this);`
`218`	`217`	`onlinePlayerMap.put(player.getUuid(), player);`
`219`	`218`	`onlinePlayerList.add(player);`
`220`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public Optional<ServerWorld> getServerWorld(Object world) {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`public ServerWorld getServerWorld(World world) {`
`204`		`- return worlds.get(world);`
	`204`	`+ return worlds.get(Objects.requireNonNull(world));`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`@Override`
`@@ -242,15 +242,15 @@ public Collection<Player> getOnlinePlayers() {`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`private void initPlayer(org.bukkit.entity.Player bukkitPlayer) {`
`245`		`- BukkitPlayer player = new BukkitPlayer(bukkitPlayer.getUniqueId());`
	`245`	`+ BukkitPlayer player = new BukkitPlayer(bukkitPlayer);`
`246`	`246`	`onlinePlayerMap.put(bukkitPlayer.getUniqueId(), player);`
`247`	`247`	`onlinePlayerList.add(player);`
`248`	`248`
`249`	`249`	`// update player every 20 seconds`
`250`	`250`	`scheduledTasks.add(`
`251`	`251`	`bukkitPlayer.getScheduler().runAtFixedRate(this, task -> {`
`252`	`252`	`player.update();`
`253`		`- }, () -> {}, 20, 20)`
	`253`	`+ }, null, 20, 20)`
`254`	`254`	`);`
`255`	`255`	`}`
`256`	`256`