From c0e2ff98edd4b2feb0e838bdede6ec4a176b4c37 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 9 Aug 2018 19:58:32 +0200 Subject: [PATCH] Final commit to 1.13 --- WorldSystem/bin/plugin.yml | 2 +- WorldSystem/src/1_13_gui.yml | 4 ++-- WorldSystem/src/de/butzlabben/world/wrapper/SystemWorld.java | 3 ++- WorldSystem/src/old_gui.yml | 2 +- WorldSystem/src/plugin.yml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/WorldSystem/bin/plugin.yml b/WorldSystem/bin/plugin.yml index 4a541ac..75e7831 100644 --- a/WorldSystem/bin/plugin.yml +++ b/WorldSystem/bin/plugin.yml @@ -1,5 +1,5 @@ name: WorldSystem -version: 2.2.0.6 +version: 2.3.0 author: Butzlabben main: de.butzlabben.world.WorldSystem diff --git a/WorldSystem/src/1_13_gui.yml b/WorldSystem/src/1_13_gui.yml index dd4f22b..f90554d 100644 --- a/WorldSystem/src/1_13_gui.yml +++ b/WorldSystem/src/1_13_gui.yml @@ -86,8 +86,8 @@ options: slot: row: 6 col: 5 - material: DOUBLE_PLANT - display: '&eCurrent page: %page' + material: SUNFLOWER + display: '&eCurrent page: &a%page' player_list_to_row: 4 playerhead: display: '&e%player' diff --git a/WorldSystem/src/de/butzlabben/world/wrapper/SystemWorld.java b/WorldSystem/src/de/butzlabben/world/wrapper/SystemWorld.java index ec1c2ac..add074d 100644 --- a/WorldSystem/src/de/butzlabben/world/wrapper/SystemWorld.java +++ b/WorldSystem/src/de/butzlabben/world/wrapper/SystemWorld.java @@ -35,7 +35,7 @@ public class SystemWorld { private String worldname; private boolean unloading = false; private boolean creating = false; - + private static HashMap cached = new HashMap<>(); /** @@ -96,6 +96,7 @@ public class SystemWorld { }); return; } + Preconditions.checkNotNull(w, "world must not be null"); unloading = true; w.save(); diff --git a/WorldSystem/src/old_gui.yml b/WorldSystem/src/old_gui.yml index 2ee3056..9a25f8e 100644 --- a/WorldSystem/src/old_gui.yml +++ b/WorldSystem/src/old_gui.yml @@ -90,7 +90,7 @@ options: row: 6 col: 5 material: DOUBLE_PLANT - display: '&eCurrent page: %page' + display: '&eCurrent page: &a%page' player_list_to_row: 4 playerhead: display: '&e%player' diff --git a/WorldSystem/src/plugin.yml b/WorldSystem/src/plugin.yml index 4a541ac..75e7831 100644 --- a/WorldSystem/src/plugin.yml +++ b/WorldSystem/src/plugin.yml @@ -1,5 +1,5 @@ name: WorldSystem -version: 2.2.0.6 +version: 2.3.0 author: Butzlabben main: de.butzlabben.world.WorldSystem