Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-09-16 01:57:14 +02:00
Code Issues Projects Releases Wiki Activity

Make use of Spigot's Bukkit#unloadWorld(World, false) fix

Browse Source
This commit is contained in:
Daniel Saukel 2020-04-07 02:23:40 +02:00
parent 93c786301a
commit 83ad5e24d9
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/de/erethon/dungeonsxl/world/DEditWorld.java
View File

@ -16,6 +16,7 @@
*/
package de.erethon.dungeonsxl.world;
import de.erethon.commons.compatibility.Version;
import de.erethon.commons.misc.FileUtil;
import de.erethon.dungeonsxl.DungeonsXL;
import de.erethon.dungeonsxl.api.world.EditWorld;
@ -119,7 +120,7 @@ public class DEditWorld extends DInstanceWorld implements EditWorld {
FileUtil.copyDir(getFolder(), getResource().getFolder(), DungeonsXL.EXCLUDED_FILES);
DResourceWorld.deleteUnusedFiles(getResource().getFolder());
if (!save) {
Bukkit.unloadWorld(getWorld(), true);
Bukkit.unloadWorld(getWorld(), /* SPIGOT-5225 */ !Version.isAtLeast(Version.MC1_14_4));
}
FileUtil.removeDir(getFolder());

3
core/src/main/java/de/erethon/dungeonsxl/world/DGameWorld.java
View File

@ -19,6 +19,7 @@ package de.erethon.dungeonsxl.world;
import de.erethon.caliburn.CaliburnAPI;
import de.erethon.caliburn.item.ExItem;
import de.erethon.caliburn.item.VanillaItem;
import de.erethon.commons.compatibility.Version;
import de.erethon.commons.misc.BlockUtil;
import de.erethon.commons.misc.FileUtil;
import de.erethon.dungeonsxl.DungeonsXL;
@ -452,7 +453,7 @@ public class DGameWorld extends DInstanceWorld implements GameWorld {
kickAllPlayers();
Bukkit.unloadWorld(getWorld(), true);
Bukkit.unloadWorld(getWorld(), /* SPIGOT-5225 */ !Version.isAtLeast(Version.MC1_14_4));
FileUtil.removeDir(getFolder());
plugin.getInstanceCache().remove(this);
}

5
core/src/main/java/de/erethon/dungeonsxl/world/DResourceWorld.java
View File

@ -17,6 +17,7 @@
package de.erethon.dungeonsxl.world;
import de.erethon.commons.chat.MessageUtil;
import de.erethon.commons.compatibility.Version;
import de.erethon.commons.misc.FileUtil;
import de.erethon.dungeonsxl.DungeonsXL;
import de.erethon.dungeonsxl.api.dungeon.Dungeon;
@ -182,7 +183,7 @@ public class DResourceWorld implements ResourceWorld {
World world = Bukkit.getWorld(name);
boolean removed = false;
if (world != null && world.getPlayers().isEmpty()) {
Bukkit.unloadWorld(name, false);
Bukkit.unloadWorld(name, /* SPIGOT-5225 */ !Version.isAtLeast(Version.MC1_14_4));
}
if (world == null || world.getPlayers().isEmpty()) {
removed = instanceFolder.delete();
@ -316,7 +317,7 @@ public class DResourceWorld implements ResourceWorld {
World world = rawCreator.createWorld();
File worldFolder = new File(Bukkit.getWorldContainer(), ".raw");
FileUtil.copyDir(worldFolder, RAW, DungeonsXL.EXCLUDED_FILES);
Bukkit.unloadWorld(world, false);
Bukkit.unloadWorld(world, /* SPIGOT-5225 */ !Version.isAtLeast(Version.MC1_14_4));
FileUtil.removeDir(worldFolder);
}