Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 13:36:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE when leaving dungeons; resolves #546

Browse Source
This commit is contained in:
Daniel Saukel 2019-03-19 22:33:20 +01:00
parent 0339ee5763
commit 820527ea28
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,9 @@ public class RespawnTask extends BukkitRunnable {
@Override
public void run() {
if (!player.isOnline()) {
return;
}
if (player.getWorld() != location.getWorld() || player.getLocation().distance(location) > 2) {
PlayerUtil.secureTeleport(player, location);
}

2
src/main/java/de/erethon/dungeonsxl/world/WorldUnloadTask.java
View File

@ -36,7 +36,7 @@ public class WorldUnloadTask extends BukkitRunnable {
Set<DInstanceWorld> instances = plugin.getDWorldCache().getInstances();
for (DInstanceWorld instance : instances.toArray(new DInstanceWorld[instances.size()])) {
if (instance.exists()) {
if (instance.getWorld().getPlayers().isEmpty()) {
if (instance.getPlayers().isEmpty()) {
instance.delete();
}
}