Fix #60

Pitan76 · Jul 7, 2023 · 7b44e22 · 7b44e22
1 parent 701eb72
commit 7b44e22
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/main/java/ml/pkom/itemalchemy/EMCManager.java b/src/main/java/ml/pkom/itemalchemy/EMCManager.java
@@ -598,15 +598,17 @@ public static long getEmcFromPlayer(Player player) {
         return teamState.map(state -> state.storedEMC).orElse(0L);
     }
 
-    public static void syncS2C(ServerPlayerEntity player) {
-        if (player.networkHandler == null) {
+    public static void syncS2C(ServerPlayerEntity serverPlayer) {
+        if (serverPlayer.networkHandler == null) {
             return;
         }
 
+        Player player = new Player(serverPlayer);
+
         ServerState serverState = ServerState.getServerState(player.getWorld().getServer());
         PacketByteBuf buf = PacketByteUtil.create();
 
-        TeamState teamState = serverState.getTeamByPlayer(player.getUuid()).get();
+        TeamState teamState = serverState.getTeamByPlayer(player.getUUID()).get();
 
         NbtCompound nbt = new NbtCompound();
         NbtCompound teamNBT = new NbtCompound();
@@ -617,7 +619,7 @@ public static void syncS2C(ServerPlayerEntity player) {
 
         buf.writeNbt(nbt);
 
-        ServerNetworking.send(player, ItemAlchemy.id("sync_emc"), buf);
+        ServerNetworking.send(serverPlayer, ItemAlchemy.id("sync_emc"), buf);
     }
 
     public static void syncS2C_emc_map(ServerPlayerEntity player) {

diff --git a/src/main/java/ml/pkom/itemalchemy/ItemAlchemy.java b/src/main/java/ml/pkom/itemalchemy/ItemAlchemy.java
@@ -55,14 +55,15 @@ public static void init() {
 
         EventRegistry.ServerLifecycle.serverStarted(EMCManager::init);
 
-        EventRegistry.ServerConnection.join((player) -> {
-            if (player != null) {
-                EMCManager.syncS2C_emc_map(player);
+        EventRegistry.ServerConnection.join((p) -> {
+            if (p != null) {
+                Player player = new Player(p);
+                EMCManager.syncS2C_emc_map(p);
                 ServerState serverState = ServerState.getServerState(player.getWorld().getServer());
 
-                serverState.createPlayer(new Player(player));
+                serverState.createPlayer(player);
 
-                EMCManager.syncS2C(player);
+                EMCManager.syncS2C(p);
             }
         });