29 lines
2.2 KiB
Diff
29 lines
2.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
Date: Sun, 2 Jan 2022 22:34:51 -0800
|
||
|
|
Subject: [PATCH] Add config option for worlds affected by time cmd
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/commands/TimeCommand.java b/src/main/java/net/minecraft/server/commands/TimeCommand.java
|
||
|
|
index e1908c2fcad3d1505bdcd65ba7ceb3dfa42c5c39..f0a7a8df3caa2ea765bb0a87cfede71d0995d276 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/commands/TimeCommand.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/commands/TimeCommand.java
|
||
|
|
@@ -51,7 +51,7 @@ public class TimeCommand {
|
||
|
|
}
|
||
|
|
|
||
|
|
public static int setTime(CommandSourceStack source, int time) {
|
||
|
|
- Iterator iterator = com.google.common.collect.Iterators.singletonIterator(source.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in
|
||
|
|
+ Iterator iterator = io.papermc.paper.configuration.GlobalConfiguration.get().commands.timeCommandAffectsAllWorlds ? source.getServer().getAllLevels().iterator() : com.google.common.collect.Iterators.singletonIterator(source.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in // Paper - add config option for spigot's change
|
||
|
|
|
||
|
|
while (iterator.hasNext()) {
|
||
|
|
ServerLevel worldserver = (ServerLevel) iterator.next();
|
||
|
|
@@ -70,7 +70,7 @@ public class TimeCommand {
|
||
|
|
}
|
||
|
|
|
||
|
|
public static int addTime(CommandSourceStack source, int time) {
|
||
|
|
- Iterator iterator = com.google.common.collect.Iterators.singletonIterator(source.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in
|
||
|
|
+ Iterator iterator = io.papermc.paper.configuration.GlobalConfiguration.get().commands.timeCommandAffectsAllWorlds ? source.getServer().getAllLevels().iterator() : com.google.common.collect.Iterators.singletonIterator(source.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in // Paper - add config option for spigot's change
|
||
|
|
|
||
|
|
while (iterator.hasNext()) {
|
||
|
|
ServerLevel worldserver = (ServerLevel) iterator.next();
|