diff options
| author | Oliver Dunk <oliver@oliverdunk.com> | 2016-03-05 22:36:13 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-05 22:36:13 +1100 |
| commit | 73eff0d75dfa8c6dca768d6c447ef532d9500590 (patch) | |
| tree | 9cf644e8a1073b549cac32649f4a48aa1830fa9e /nms-patches/CommandBlockListenerAbstract.patch | |
| parent | e7537646f634cb0156bf6b1b8b3e75f06a5a13d3 (diff) | |
| download | craftbukkit-73eff0d75dfa8c6dca768d6c447ef532d9500590.tar craftbukkit-73eff0d75dfa8c6dca768d6c447ef532d9500590.tar.gz craftbukkit-73eff0d75dfa8c6dca768d6c447ef532d9500590.tar.lz craftbukkit-73eff0d75dfa8c6dca768d6c447ef532d9500590.tar.xz craftbukkit-73eff0d75dfa8c6dca768d6c447ef532d9500590.zip | |
SPIGOT-1755: CommandBlock doesn't run on empty world
Diffstat (limited to 'nms-patches/CommandBlockListenerAbstract.patch')
| -rw-r--r-- | nms-patches/CommandBlockListenerAbstract.patch | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/nms-patches/CommandBlockListenerAbstract.patch b/nms-patches/CommandBlockListenerAbstract.patch index f5f63044..949cb489 100644 --- a/nms-patches/CommandBlockListenerAbstract.patch +++ b/nms-patches/CommandBlockListenerAbstract.patch @@ -33,7 +33,7 @@ } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Executing command block"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Command to be executed"); -@@ -123,6 +133,130 @@ +@@ -123,6 +133,125 @@ } } @@ -58,11 +58,6 @@ + return 0; + } + -+ // If the world has no players don't run -+ if (sender.getWorld().players.isEmpty()) { -+ return 0; -+ } -+ + // Handle vanilla commands; + org.bukkit.command.Command commandBlockCommand = commandMap.getCommand(args[0]); + if (sender.getWorld().getServer().getCommandBlockOverride(args[0])) { |