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

Fix error handling if a referenced world is unloaded; resolves #410

Browse Source
This commit is contained in:
Daniel Saukel 2018-06-05 13:04:02 +02:00
parent b236431456
commit 186dd1192b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/erethon/dungeonsxl/player/DPlayerData.java
View File

@ -110,6 +110,9 @@ public class DPlayerData extends DREConfig {
* @return the old location * @return the old location
*/ */
public Location getOldLocation() { public Location getOldLocation() {
if (oldLocation.getWorld() == null) {
return Bukkit.getWorlds().get(0).getSpawnLocation();
}
return oldLocation; return oldLocation;
} }
@ -427,8 +430,9 @@ public class DPlayerData extends DREConfig {
} }
oldPotionEffects = (Collection<PotionEffect>) config.get(PREFIX_STATE_PERSISTENCE + "oldPotionEffects"); oldPotionEffects = (Collection<PotionEffect>) config.get(PREFIX_STATE_PERSISTENCE + "oldPotionEffects");
oldLocation = (Location) config.get(PREFIX_STATE_PERSISTENCE + "oldLocation"); try {
if (oldLocation.getWorld() == null) { oldLocation = (Location) config.get(PREFIX_STATE_PERSISTENCE + "oldLocation");
} catch (IllegalArgumentException exception) {
oldLocation = Bukkit.getWorlds().get(0).getSpawnLocation(); oldLocation = Bukkit.getWorlds().get(0).getSpawnLocation();
} }
} }