Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for PartyAndFriends NPE issue #64

Closed
wants to merge 4 commits into from
Closed

Fix for PartyAndFriends NPE issue #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b500282
Update PAF.java
MherZaqaryan Jan 21, 2024
9f3ece4
fix NPE issues for PAF bungee party implementation
MherZaqaryan Jan 21, 2024
be99cf2
fix naming issues
MherZaqaryan Jan 21, 2024
305fdb4
fix PAF NPE issue
MherZaqaryan Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAF.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -89,6 +97,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();
}
}
19 changes: 15 additions & 4 deletions proxy-plugin/src/main/java/com/andrei1058/bedwars/proxy/party/PAFBungeeCordParty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(p);
if (playerParty == null) {
return null;
}
return playerParty.isLeader(pafPlayer);
}

@Override
Expand Down Expand Up @@ -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(owner);
if (playerParty == null) {
return null;
}
return playerParty.isInParty(PAFPlayerManager.getInstance().getPlayer(check));
}

@Override
Expand All @@ -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();
}
}
Loading