Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-25 03:55:22 +01:00
Code Issues Projects Releases Wiki Activity

Make DPlayers getters a bit more robust. Should resolve #181

Browse Source
This commit is contained in:
Daniel Saukel 2016-12-17 01:52:22 +01:00
parent 4133e20471
commit 921a609830
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayers.java
View File

@ -41,7 +41,7 @@ public class DPlayers {
} }
} }
return null; return new DGlobalPlayer(player);
} }
/** /**
@ -95,11 +95,7 @@ public class DPlayers {
* an instance of DGlobalPlayer to add * an instance of DGlobalPlayer to add
*/ */
public void addPlayer(DGlobalPlayer player) { public void addPlayer(DGlobalPlayer player) {
for (DGlobalPlayer dGlobalPlayer : dGlobalPlayers) { removePlayer(player);
if (dGlobalPlayer.getPlayer().equals(player.getPlayer())) {
dGlobalPlayers.remove(dGlobalPlayer);
}
}
dGlobalPlayers.add(player); dGlobalPlayers.add(player);
} }
@ -109,7 +105,16 @@ public class DPlayers {
* an instance of DGlobalPlayer to remove * an instance of DGlobalPlayer to remove
*/ */
public void removePlayer(DGlobalPlayer player) { public void removePlayer(DGlobalPlayer player) {
dGlobalPlayers.remove(player); if (dGlobalPlayers.remove(player)) {
return;
}
// Fallback check just in case an old Player instance is kept
for (DGlobalPlayer dGlobalPlayer : dGlobalPlayers) {
if (dGlobalPlayer.getName().equals(player.getName())) {
dGlobalPlayers.remove(dGlobalPlayer);
}
}
} }
/** /**