Skip to content

Commit 967261a

Browse files
committed
Fix exception when a player joins the server on fabric-1.20
1 parent 90a8f2c commit 967261a

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public Optional<Path> getModsFolder() {
189189
public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) {
190190
if (this.serverInstance != server) return;
191191

192-
FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this);
192+
FabricPlayer player = new FabricPlayer(playerInstance, this);
193193
onlinePlayerMap.put(player.getUuid(), player);
194194
onlinePlayerList.add(player);
195195
}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ public class FabricPlayer implements Player {
6464

6565
private final FabricMod mod;
6666

67-
public FabricPlayer(UUID playerUuid, FabricMod mod) {
68-
this.uuid = playerUuid;
67+
public FabricPlayer(ServerPlayerEntity player, FabricMod mod) {
68+
this.uuid = player.getUuid();
6969
this.mod = mod;
7070

71-
update();
71+
update(player);
7272
}
7373

7474
@Override
@@ -131,6 +131,10 @@ public void update() {
131131
ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid);
132132
if (player == null) return;
133133

134+
update(player);
135+
}
136+
137+
public void update(ServerPlayerEntity player) {
134138
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameMode());
135139
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
136140

0 commit comments

Comments
 (0)