From b56a787bcf0ae4bd5d6a2e872099152d72c1c8b0 Mon Sep 17 00:00:00 2001 From: OmerBenGera Date: Fri, 23 Dec 2022 09:28:08 +0200 Subject: [PATCH] Added more debug messages to replacing players (#1513) --- .../com/bgsoftware/superiorskyblock/island/SIsland.java | 2 +- .../superiorskyblock/player/PlayersManagerImpl.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java b/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java index 51ff51ac2..e0b430eb9 100644 --- a/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java +++ b/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java @@ -1425,7 +1425,7 @@ public void replacePlayers(SuperiorPlayer originalPlayer, SuperiorPlayer newPlay Preconditions.checkNotNull(originalPlayer, "originalPlayer parameter cannot be null."); Preconditions.checkNotNull(newPlayer, "newPlayer parameter cannot be null."); - Log.debug(Debug.REPLACE_PLAYER, owner.getName(), originalPlayer.getName(), newPlayer.getName()); + Log.debug(Debug.REPLACE_PLAYER, owner, originalPlayer, newPlayer); if (owner.equals(originalPlayer)) { Log.debugResult(Debug.REPLACE_PLAYER, "Action", "Replace Owner"); diff --git a/src/main/java/com/bgsoftware/superiorskyblock/player/PlayersManagerImpl.java b/src/main/java/com/bgsoftware/superiorskyblock/player/PlayersManagerImpl.java index 3f40bc0f4..4af336b15 100644 --- a/src/main/java/com/bgsoftware/superiorskyblock/player/PlayersManagerImpl.java +++ b/src/main/java/com/bgsoftware/superiorskyblock/player/PlayersManagerImpl.java @@ -136,14 +136,17 @@ public List matchAllPlayers(Predicate pr } public void replacePlayers(SuperiorPlayer originPlayer, SuperiorPlayer newPlayer) { - Log.debug(Debug.REPLACE_PLAYER, originPlayer.getName(), newPlayer.getName()); + Log.debug(Debug.REPLACE_PLAYER, originPlayer, newPlayer); newPlayer.merge(originPlayer); // We first want to replace the player for his own island Island playerIsland = originPlayer.getIsland(); - if (playerIsland != null) + if (playerIsland != null) { playerIsland.replacePlayers(originPlayer, newPlayer); + if (playerIsland.getOwner() != newPlayer) + Log.debugResult(Debug.REPLACE_PLAYER, "Owner was not replaced", "Curr owner: " + playerIsland.getOwner().getUniqueId()); + } for (Island island : plugin.getGrid().getIslands()) { if (island != playerIsland)