twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-05 06:32:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

net.minecraft.server.commands

Browse Source
This commit is contained in:
Jake Potrebic
2024-12-14 13:42:43 -08:00
parent 973fe2a945
commit 93114d09f2
40 changed files with 460 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
paper-server/patches/sources/net/minecraft/server/commands/ScheduleCommand.java.patch Normal file
View File

@@ -0,0 +1,29 @@
--- a/net/minecraft/server/commands/ScheduleCommand.java
+++ b/net/minecraft/server/commands/ScheduleCommand.java
@@ -32,7 +_,7 @@
);
private static final SimpleCommandExceptionType ERROR_MACRO = new SimpleCommandExceptionType(Component.translatableEscape("commands.schedule.macro"));
private static final SuggestionProvider<CommandSourceStack> SUGGEST_SCHEDULE = (context, builder) -> SharedSuggestionProvider.suggest(
- context.getSource().getServer().getWorldData().overworldData().getScheduledEvents().getEventsIds(), builder
+ context.getSource().getLevel().serverLevelData.getScheduledEvents().getEventsIds(), builder // Paper - Make schedule command per-world
);
public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
@@ -101,7 +_,7 @@
} else {
long l = source.getLevel().getGameTime() + time;
ResourceLocation resourceLocation = function.getFirst();
- TimerQueue<MinecraftServer> scheduledEvents = source.getServer().getWorldData().overworldData().getScheduledEvents();
+ TimerQueue<MinecraftServer> scheduledEvents = source.getLevel().serverLevelData.overworldData().getScheduledEvents(); // CraftBukkit - SPIGOT-6667: Use world specific function timer
Optional<CommandFunction<CommandSourceStack>> optional = function.getSecond().left();
if (optional.isPresent()) {
if (optional.get() instanceof MacroFunction) {
@@ -132,7 +_,7 @@
}
private static int remove(CommandSourceStack source, String function) throws CommandSyntaxException {
- int i = source.getServer().getWorldData().overworldData().getScheduledEvents().remove(function);
+ int i = source.getLevel().serverLevelData.overworldData().getScheduledEvents().remove(function); // Paper - Make schedule command per-world
if (i == 0) {
throw ERROR_CANT_REMOVE.create(function);
} else {