From f13d855955c9604b3f1e74850f4485146232a1aa Mon Sep 17 00:00:00 2001 From: pietru Date: Tue, 5 Nov 2024 19:33:18 +0100 Subject: [PATCH] fix issue with parsing player --- .../pietru/cookie_utils/mixins/MessagePacketMixin.java | 3 ++- .../java/net/pietru/cookie_utils/utils/player_utils.java | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java b/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java index 84b8bfe..eac71e8 100644 --- a/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java +++ b/src/main/java/net/pietru/cookie_utils/mixins/MessagePacketMixin.java @@ -26,7 +26,8 @@ public class MessagePacketMixin { public String playerUniqueId; @Shadow public String message; - private static Map ply_msgs = new HashMap<>(); + @Unique + private static final Map ply_msgs = new HashMap<>(); @Inject(method = "handle", at = @At("HEAD"), cancellable = true) private void event_on_message(CallbackInfo ci, @Local NetworkIdentity identity, @Local ChannelHandlerContext ctx){ diff --git a/src/main/java/net/pietru/cookie_utils/utils/player_utils.java b/src/main/java/net/pietru/cookie_utils/utils/player_utils.java index 6824ce8..f3749a6 100644 --- a/src/main/java/net/pietru/cookie_utils/utils/player_utils.java +++ b/src/main/java/net/pietru/cookie_utils/utils/player_utils.java @@ -1,6 +1,7 @@ package net.pietru.cookie_utils.utils; import com.badlogic.gdx.utils.Array; +import finalforeach.cosmicreach.GameSingletons; import finalforeach.cosmicreach.accounts.Account; import finalforeach.cosmicreach.chat.commands.Command; import finalforeach.cosmicreach.entities.player.Player; @@ -46,15 +47,15 @@ public class player_utils { } public static Player parseAsPlayer(String arg) { - Array players = InGame.getWorld().players; - Player player = (Player) ArrayUtils.find(players, (p) -> { + Array players = GameSingletons.world.players; + Player player = ArrayUtils.find(players, (p) -> { Account account = p.getAccount(); return account != null && arg.equals(account.getUniqueId()); }); if (player != null) { return player; } else { - player = (Player)ArrayUtils.find(players, (p) -> { + player = ArrayUtils.find(players, (p) -> { Account account = p.getAccount(); return account != null && arg.equals(account.getUsername()); }); @@ -75,7 +76,7 @@ public class player_utils { String combined = var10000 + ":" + arg; return combined.equals(account.getUsername()); }, allMatches); - return allMatches.size == 1 ? (Player)allMatches.first() : null; + return allMatches.size == 1 ? allMatches.first() : null; } } }