summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-11-29 00:53:49 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-11-29 00:53:49 +0000
commit8c3698bf0f7aef6de972b41f7db1eae308935d63 (patch)
treecc6811115ecd32e8f667c7617dabbf284aaec83e /nms-patches
parent585a827dcde0a7700cfeb21e2802f143f383c38e (diff)
downloadcraftbukkit-8c3698bf0f7aef6de972b41f7db1eae308935d63.tar
craftbukkit-8c3698bf0f7aef6de972b41f7db1eae308935d63.tar.gz
craftbukkit-8c3698bf0f7aef6de972b41f7db1eae308935d63.tar.lz
craftbukkit-8c3698bf0f7aef6de972b41f7db1eae308935d63.tar.xz
craftbukkit-8c3698bf0f7aef6de972b41f7db1eae308935d63.zip
Fix command blocks
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/MinecraftServer.patch13
1 files changed, 11 insertions, 2 deletions
diff --git a/nms-patches/MinecraftServer.patch b/nms-patches/MinecraftServer.patch
index 16c86c8d..ed8f4f64 100644
--- a/nms-patches/MinecraftServer.patch
+++ b/nms-patches/MinecraftServer.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/MinecraftServer.java 2014-11-28 23:52:53.297215828 +0000
-+++ src/main/java/net/minecraft/server/MinecraftServer.java 2014-11-28 23:52:44.593216021 +0000
+--- ../work/decompile-8eb82bde//net/minecraft/server/MinecraftServer.java 2014-11-29 00:53:37.929134938 +0000
++++ src/main/java/net/minecraft/server/MinecraftServer.java 2014-11-29 00:52:46.133136087 +0000
@@ -37,6 +37,18 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -617,6 +617,15 @@
}
public static MinecraftServer getServer() {
+@@ -779,7 +1037,7 @@
+ }
+
+ public boolean N() {
+- return this.universe != null;
++ return true; // CraftBukkit
+ }
+
+ public String getName() {
@@ -835,8 +1093,10 @@
}