fix PAF NPE issue

andrei1058 · Jan 21, 2024 · 305fdb4 · 305fdb4
1 parent be99cf2
commit 305fdb4
Showing 1 changed file with 10 additions and 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
@@ -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