SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly re-register commands on reload

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-06-22 14:07:01 +10:00
parent 1a3bda4647
commit 85a9d69882
22 changed files with 97 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0025-Netty.patch
View File

@@ -1,4 +1,4 @@
From ad431c66fd54963754e01d91185c0741474bdfe6 Mon Sep 17 00:00:00 2001
From 33f4ba2034fd8cd22a8b9da2115c25000154c038 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:23:00 +1000
Subject: [PATCH] Netty
@@ -26,10 +26,10 @@ index 8c9f66b..a33020e 100644
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 2d638c0..7675076 100644
index 59444cb..e101f95 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -99,7 +99,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -100,7 +100,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.G());
try {
@@ -183,10 +183,10 @@ index 17cfacc..a945892 100644
this.b = true;
} catch (Exception exception) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 24f1f39..07bcb29 100644
index 6e6fe1c..68694de 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1367,4 +1367,20 @@ public final class CraftServer implements Server {
@@ -1369,4 +1369,20 @@ public final class CraftServer implements Server {
public CraftScoreboardManager getScoreboardManager() {
return scoreboardManager;
}
@@ -350,7 +350,7 @@ index 0000000..386c2f8
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 32140d1..e762527 100644
index b7f3896..606b01e 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,8 @@ import java.io.IOException;
@@ -362,7 +362,7 @@ index 32140d1..e762527 100644
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -146,4 +148,44 @@ public class SpigotConfig
@@ -148,4 +150,44 @@ public class SpigotConfig
commands.put( "restart", new RestartCommand( "restart" ) );
WatchdogThread.doStart( timeoutTime, restartOnCrash );
}