13
0
geforkt von Mirrors/Paper
Paper/patches/server/0576-Make-schedule-command-per-world.patch

29 Zeilen
1.8 KiB
Diff

2021-06-14 21:58:32 +02:00
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/ScheduleCommand.java b/src/main/java/net/minecraft/server/commands/ScheduleCommand.java
2021-11-24 19:27:25 +01:00
index 210df39e99bfe0f373cbdf7e0cd45ff1db9cd4aa..c0127908a954d3a40ca8829e3f1f63112212f261 100644
2021-06-14 21:58:32 +02:00
--- a/src/main/java/net/minecraft/server/commands/ScheduleCommand.java
+++ b/src/main/java/net/minecraft/server/commands/ScheduleCommand.java
2021-11-24 19:27:25 +01:00
@@ -31,7 +31,7 @@ public class ScheduleCommand {
2021-07-24 04:33:05 +02:00
return new TranslatableComponent("commands.schedule.cleared.failure", new Object[]{object});
2021-06-14 21:58:32 +02:00
});
2021-07-24 04:33:05 +02:00
private static final SuggestionProvider<CommandSourceStack> SUGGEST_SCHEDULE = (commandcontext, suggestionsbuilder) -> {
- return SharedSuggestionProvider.suggest((Iterable) ((CommandSourceStack) commandcontext.getSource()).getServer().getWorldData().overworldData().getScheduledEvents().getEventsIds(), suggestionsbuilder);
+ return SharedSuggestionProvider.suggest((Iterable) ((net.minecraft.commands.CommandSourceStack) commandcontext.getSource()).getLevel().serverLevelData.getScheduledEvents().getEventsIds(), suggestionsbuilder); // Paper
2021-06-14 21:58:32 +02:00
};
2021-07-24 04:33:05 +02:00
public ScheduleCommand() {}
2021-11-24 19:27:25 +01:00
@@ -82,7 +82,7 @@ public class ScheduleCommand {
2021-06-14 21:58:32 +02:00
}
private static int remove(CommandSourceStack source, String eventName) throws CommandSyntaxException {
- int i = source.getServer().getWorldData().overworldData().getScheduledEvents().remove(eventName);
+ int i = source.getLevel().serverLevelData.getScheduledEvents().remove(eventName); // Paper
2021-07-24 04:33:05 +02:00
2021-06-14 21:58:32 +02:00
if (i == 0) {
2021-07-24 04:33:05 +02:00
throw ScheduleCommand.ERROR_CANT_REMOVE.create(eventName);