From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic <jake.m.potrebic@gmail.com> Date: Mon, 4 Jan 2021 19:52:44 -0800 Subject: [PATCH] Make schedule command per-world diff --git a/src/main/java/net/minecraft/server/commands/CommandSchedule.java b/src/main/java/net/minecraft/server/commands/CommandSchedule.java index b88a91072032b75f83d811d63e1b5e3808faa9be..440b25dde0299037032d535c4c751f252775d6ad 100644 --- a/src/main/java/net/minecraft/server/commands/CommandSchedule.java +++ b/src/main/java/net/minecraft/server/commands/CommandSchedule.java @@ -32,7 +32,7 @@ public class CommandSchedule { return new ChatMessage("commands.schedule.cleared.failure", new Object[]{object}); }); private static final SuggestionProvider<CommandListenerWrapper> c = (commandcontext, suggestionsbuilder) -> { - return ICompletionProvider.b((Iterable) ((CommandListenerWrapper) commandcontext.getSource()).getServer().getSaveData().H().u().a(), suggestionsbuilder); + return ICompletionProvider.b((Iterable) ((CommandListenerWrapper) commandcontext.getSource()).getWorld().worldDataServer.H().u().a(), suggestionsbuilder); // Paper }; public static void a(CommandDispatcher<CommandListenerWrapper> commanddispatcher) { @@ -55,7 +55,7 @@ public class CommandSchedule { } else { long j = commandlistenerwrapper.getWorld().getTime() + (long) i; MinecraftKey minecraftkey = (MinecraftKey) pair.getFirst(); - CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue = commandlistenerwrapper.getServer().getSaveData().H().u(); + CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue = commandlistenerwrapper.getWorld().worldDataServer.H().u(); // Paper ((Either) pair.getSecond()).ifLeft((customfunction) -> { String s = minecraftkey.toString(); @@ -81,7 +81,7 @@ public class CommandSchedule { } private static int a(CommandListenerWrapper commandlistenerwrapper, String s) throws CommandSyntaxException { - int i = commandlistenerwrapper.getServer().getSaveData().H().u().a(s); + int i = commandlistenerwrapper.getWorld().worldDataServer.H().u().a(s); // Paper if (i == 0) { throw CommandSchedule.b.create(s);