From b5002829faa9b9193602c227930e78b7abb28451 Mon Sep 17 00:00:00 2001 From: Mher Zaqaryan Date: Sun, 21 Jan 2024 17:51:03 +0400 Subject: [PATCH 1/4] Update PAF.java --- .../main/java/com/andrei1058/bedwars/proxy/party/PAF.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAF.java b/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAF.java index 8236001..7c52dbb 100644 --- a/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAF.java +++ b/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAF.java @@ -89,6 +89,10 @@ public boolean isInternal() { @Override public UUID getOwner(UUID player) { - return getPAFParty(player).getLeader().getUniqueId(); + PlayerParty playerParty = getPAFParty(player); + if (playerParty == null) { + return null; + } + return playerParty.getLeader().getUniqueId(); } } From 9f3ece41a8e8c83ad8d6cae6c4477cc4f8508cab Mon Sep 17 00:00:00 2001 From: Mher Zaqaryan Date: Sun, 21 Jan 2024 17:56:10 +0400 Subject: [PATCH 2/4] fix NPE issues for PAF bungee party implementation --- .../proxy/party/PAFBungeeCordParty.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAFBungeeCordParty.java b/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAFBungeeCordParty.java index e511072..e5e4c22 100644 --- a/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAFBungeeCordParty.java +++ b/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAFBungeeCordParty.java @@ -29,8 +29,11 @@ public int partySize(UUID p) { @Override public boolean isOwner(UUID p) { - PAFPlayer pafPlayer = PAFPlayerManager.getInstance().getPlayer(p); - return PartyManager.getInstance().getParty(pafPlayer).isLeader(pafPlayer); + PlayerParty playerParty = getPAFParty(player); + if (playerParty == null) { + return null; + } + return playerParty.isLeader(pafPlayer); } @Override @@ -61,7 +64,11 @@ public void disband(UUID owner) { @Override public boolean isMember(UUID owner, UUID check) { - return getPAFParty(owner).isInParty(PAFPlayerManager.getInstance().getPlayer(check)); + PlayerParty playerParty = getPAFParty(player); + if (playerParty == null) { + return null; + } + return playerParty.isInParty(PAFPlayerManager.getInstance().getPlayer(check)); } @Override @@ -75,6 +82,10 @@ public boolean isInternal() { @Override public UUID getOwner(UUID player) { - return getPAFParty(player).getLeader().getUniqueId(); + PlayerParty playerParty = getPAFParty(player); + if (playerParty == null) { + return null; + } + return playerParty.getLeader().getUniqueId(); } } From be99cf244bfb459215af5d26cf9c286ed48dd792 Mon Sep 17 00:00:00 2001 From: Mher Zaqaryan Date: Sun, 21 Jan 2024 17:58:01 +0400 Subject: [PATCH 3/4] fix naming issues --- .../andrei1058/bedwars/proxy/party/PAFBungeeCordParty.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAFBungeeCordParty.java b/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAFBungeeCordParty.java index e5e4c22..7a51fc7 100644 --- a/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAFBungeeCordParty.java +++ b/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAFBungeeCordParty.java @@ -29,7 +29,7 @@ public int partySize(UUID p) { @Override public boolean isOwner(UUID p) { - PlayerParty playerParty = getPAFParty(player); + PlayerParty playerParty = getPAFParty(p); if (playerParty == null) { return null; } @@ -64,7 +64,7 @@ public void disband(UUID owner) { @Override public boolean isMember(UUID owner, UUID check) { - PlayerParty playerParty = getPAFParty(player); + PlayerParty playerParty = getPAFParty(owner); if (playerParty == null) { return null; } From 305fdb4cc13c5eea03b2daa5878d3c6c190b061a Mon Sep 17 00:00:00 2001 From: Mher Zaqaryan Date: Sun, 21 Jan 2024 18:00:01 +0400 Subject: [PATCH 4/4] fix PAF NPE issue --- .../java/com/andrei1058/bedwars/proxy/party/PAF.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAF.java b/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAF.java index 7c52dbb..daeaefe 100644 --- a/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAF.java +++ b/proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAF.java @@ -74,12 +74,20 @@ public void disband(UUID owner) { @Override public boolean isMember(UUID owner, UUID check) { - return getPAFParty(owner).isInParty(PAFPlayerManager.getInstance().getPlayer(Bukkit.getPlayer(check))); + PlayerParty playerParty = getPAFParty(owner); + if (playerParty == null) { + return null; + } + return playerParty.isInParty(PAFPlayerManager.getInstance().getPlayer(Bukkit.getPlayer(check))); } @Override public void removePlayer(UUID owner, UUID target) { - getPAFParty(owner).leaveParty(PAFPlayerManager.getInstance().getPlayer(target)); + PlayerParty playerParty = getPAFParty(owner); + if (playerParty == null) { + return null; + } + playerParty.leaveParty(PAFPlayerManager.getInstance().getPlayer(target)); } @Override