Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-18 01:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some reload issues.

Browse Source 
And some unload issues.
This commit is contained in:
wizjany 2019-06-11 18:02:07 -04:00
parent fd1178a3d0
commit efb7650d6f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
View File

@ -315,7 +315,8 @@ public class BukkitWorld extends AbstractWorld {
} else if (other == null) { } else if (other == null) {
return false; return false;
} else if ((other instanceof BukkitWorld)) { } else if ((other instanceof BukkitWorld)) {
return ((BukkitWorld) other).getWorld().equals(getWorld()); World otherWorld = ((BukkitWorld) other).worldRef.get();
return otherWorld != null && otherWorld.equals(getWorld());
} else if (other instanceof com.sk89q.worldedit.world.World) { } else if (other instanceof com.sk89q.worldedit.world.World) {
return ((com.sk89q.worldedit.world.World) other).getName().equals(getName()); return ((com.sk89q.worldedit.world.World) other).getName().equals(getName());
} else { } else {

10
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -136,10 +136,15 @@ public class WorldEditPlugin extends JavaPlugin implements TabCompleter {
// these don't stick around between reload // these don't stick around between reload
loadAdapter(); loadAdapter();
loadConfig(); loadConfig();
WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent());
} catch (Throwable ignored) { } catch (Throwable ignored) {
} }
} else { } else {
getServer().getPluginManager().registerEvents((worldInitListener = new WorldInitListener()), this); getServer().getPluginManager().registerEvents((worldInitListener = new WorldInitListener()), this);
loadAdapter(); // Need an adapter to work with special blocks with NBT data
setupRegistries();
WorldEdit.getInstance().loadMappings();
loadConfig(); // Load configuration
} }
// Enable metrics // Enable metrics
@ -148,12 +153,7 @@ public class WorldEditPlugin extends JavaPlugin implements TabCompleter {
} }
private void setupWorldData() { private void setupWorldData() {
loadAdapter(); // Need an adapter to work with special blocks with NBT data
setupRegistries();
WorldEdit.getInstance().loadMappings();
loadConfig(); // Load configuration
setupTags(); setupTags();
WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent()); WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent());
} }