Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-09 12:20:30 +01:00
Code Issues Projects Releases Wiki Activity

Fixed that end signs didn't work when the player quit the server while being in a dungeon before; resolves #594

Browse Source
This commit is contained in:
Daniel Saukel 2019-06-18 00:16:13 +02:00
parent 2641fb7e5c
commit 0684e3b34a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/de/erethon/dungeonsxl/player/DGroup.java
View File

@ -200,7 +200,7 @@ public class DGroup {
*/ */
public Set<DGlobalPlayer> getDGlobalPlayers() { public Set<DGlobalPlayer> getDGlobalPlayers() {
Set<DGlobalPlayer> players = new HashSet<>(); Set<DGlobalPlayer> players = new HashSet<>();
for (UUID uuid : this.players.getUniqueIds()) { for (UUID uuid : this.players) {
players.add(dPlayers.getByUniqueId(uuid)); players.add(dPlayers.getByUniqueId(uuid));
} }
return players; return players;
@ -211,7 +211,7 @@ public class DGroup {
*/ */
public Set<DGamePlayer> getDGamePlayers() { public Set<DGamePlayer> getDGamePlayers() {
Set<DGamePlayer> players = new HashSet<>(); Set<DGamePlayer> players = new HashSet<>();
for (UUID uuid : this.players.getUniqueIds()) { for (UUID uuid : this.players) {
DGlobalPlayer dPlayer = dPlayers.getByUniqueId(uuid); DGlobalPlayer dPlayer = dPlayers.getByUniqueId(uuid);
if (dPlayer instanceof DGamePlayer) { if (dPlayer instanceof DGamePlayer) {
players.add((DGamePlayer) dPlayer); players.add((DGamePlayer) dPlayer);

3
core/src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java
View File

@ -420,7 +420,6 @@ public class DPlayerListener implements Listener {
Game game = Game.getByWorld(player.getWorld()); Game game = Game.getByWorld(player.getWorld());
if (!(dPlayer instanceof DInstancePlayer)) { if (!(dPlayer instanceof DInstancePlayer)) {
dPlayers.removePlayer(dPlayer);
if (dGroup != null) { if (dGroup != null) {
dGroup.removePlayer(player); dGroup.removePlayer(player);
} }
@ -442,6 +441,8 @@ public class DPlayerListener implements Listener {
} else if (dPlayer instanceof DEditPlayer) { } else if (dPlayer instanceof DEditPlayer) {
((DEditPlayer) dPlayer).leave(); ((DEditPlayer) dPlayer).leave();
} }
dPlayers.removePlayer(dPlayer);
} }
@EventHandler @EventHandler