Merge branch 'master' of ssh://totemo_github/NerdNu/KitchenSink

NerdNu · Feb 25, 2018 · 5314bc9 · 5314bc9
2 parents 26bdf2e + 8a1a040
commit 5314bc9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/config.yml b/config.yml
@@ -70,6 +70,7 @@ restart-times:
 
 warn-restart-on-join: true
 warn-restart-on-inventory-open: true
+bungee-disconnect-on-restart: false
 sprint-max-time: 40
 countdown:
   maxTime: 15

diff --git a/src/nu/nerd/kitchensink/Configuration.java b/src/nu/nerd/kitchensink/Configuration.java
@@ -75,6 +75,7 @@ public class Configuration {
     public boolean DISABLE_PEARL_DROPS_IN_END;
     public boolean DISABLE_PLAYER_DAMAGE_TO_VILLAGERS;
     public boolean NORMALIZE_CHAT;
+    public boolean BUNGEE_DISCONNECT_ON_RESTART;
 
     public Configuration(KitchenSink instance) {
         plugin = instance;
@@ -169,6 +170,7 @@ public void load() {
         DISABLE_PEARL_DROPS_IN_END = plugin.getConfig().getBoolean("disable-pearl-drops-in-end", false);
         DISABLE_PLAYER_DAMAGE_TO_VILLAGERS = plugin.getConfig().getBoolean("disable-player-damage-to-villagers", false);
         NORMALIZE_CHAT = plugin.getConfig().getBoolean("normalize-chat", true);
+        BUNGEE_DISCONNECT_ON_RESTART = plugin.getConfig().getBoolean("bungee-disconnect-on-restart", false);
     }
 
     protected void setCountDownSetting(countdown setting, Object value) {

diff --git a/src/nu/nerd/kitchensink/KitchenSink.java b/src/nu/nerd/kitchensink/KitchenSink.java
@@ -21,6 +21,8 @@
 import java.util.TreeMap;
 import java.util.logging.Logger;
 
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
 import nu.nerd.kitchensink.ServerListPing17.StatusResponse;
 
 import org.bukkit.Art;
@@ -177,6 +179,13 @@ public void onDisable() {
                 recipeList.remove(r);
             }
         }
+
+        if (config.BUNGEE_DISCONNECT_ON_RESTART) {
+            for (Player player : getServer().getOnlinePlayers()) {
+                proxyKick(player);
+            }
+        }
+
     }
 
     @Override
@@ -1011,4 +1020,12 @@ public static Block getTargetBlock(LivingEntity entity) {
         }
         return null;
     }
+
+    public void proxyKick(Player player) {
+        ByteArrayDataOutput out = ByteStreams.newDataOutput();
+        out.writeUTF("KickPlayer");
+        out.writeUTF(player.getName());
+        out.writeUTF("Server closed");
+        player.sendPluginMessage(this, "BungeeCord", out.toByteArray());
+    }
 }