Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-22 10:35:16 +01:00
Code Issues Projects Releases Wiki Activity

Fix exception when a player joins the server on fabric-1.20

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2024-07-21 09:52:47 +02:00
parent 90a8f2c20f
commit 967261a98a
No known key found for this signature in database
GPG Key ID: AA33883B1BBA03E6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
implementations/fabric-1.20/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
View File

@ -189,7 +189,7 @@ public Optional<Path> getModsFolder() {
public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) {
if (this.serverInstance != server) return; if (this.serverInstance != server) return;
FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this); FabricPlayer player = new FabricPlayer(playerInstance, this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }

10
implementations/fabric-1.20/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java
View File

@ -64,11 +64,11 @@ public class FabricPlayer implements Player {
private final FabricMod mod; private final FabricMod mod;
public FabricPlayer(UUID playerUuid, FabricMod mod) { public FabricPlayer(ServerPlayerEntity player, FabricMod mod) {
this.uuid = playerUuid; this.uuid = player.getUuid();
this.mod = mod; this.mod = mod;
update(); update(player);
} }
@Override @Override
@ -131,6 +131,10 @@ public void update() {
ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid); ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid);
if (player == null) return; if (player == null) return;
update(player);
}
public void update(ServerPlayerEntity player) {
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameMode()); this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameMode());
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL; if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;