51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
--- a/net/minecraft/server/commands/CommandTime.java
|
|
+++ b/net/minecraft/server/commands/CommandTime.java
|
|
@@ -8,6 +8,11 @@
|
|
import net.minecraft.network.chat.IChatBaseComponent;
|
|
import net.minecraft.server.level.WorldServer;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.event.world.TimeSkipEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class CommandTime {
|
|
|
|
public CommandTime() {}
|
|
@@ -48,8 +53,15 @@
|
|
}
|
|
|
|
public static int setTime(CommandListenerWrapper commandlistenerwrapper, int i) {
|
|
- for (WorldServer worldserver : commandlistenerwrapper.getServer().getAllLevels()) {
|
|
- worldserver.setDayTime((long) i);
|
|
+ // CraftBukkit start - SPIGOT-6496: Only set the time for the world the command originates in
|
|
+ {
|
|
+ WorldServer worldserver = commandlistenerwrapper.getLevel();
|
|
+ TimeSkipEvent event = new TimeSkipEvent(worldserver.getWorld(), TimeSkipEvent.SkipReason.COMMAND, i - worldserver.getDayTime());
|
|
+ Bukkit.getPluginManager().callEvent(event);
|
|
+ if (!event.isCancelled()) {
|
|
+ worldserver.setDayTime((long) worldserver.getDayTime() + event.getSkipAmount());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
commandlistenerwrapper.getServer().forceTimeSynchronization();
|
|
@@ -60,8 +72,15 @@
|
|
}
|
|
|
|
public static int addTime(CommandListenerWrapper commandlistenerwrapper, int i) {
|
|
- for (WorldServer worldserver : commandlistenerwrapper.getServer().getAllLevels()) {
|
|
- worldserver.setDayTime(worldserver.getDayTime() + (long) i);
|
|
+ // CraftBukkit start - SPIGOT-6496: Only set the time for the world the command originates in
|
|
+ {
|
|
+ WorldServer worldserver = commandlistenerwrapper.getLevel();
|
|
+ TimeSkipEvent event = new TimeSkipEvent(worldserver.getWorld(), TimeSkipEvent.SkipReason.COMMAND, i);
|
|
+ Bukkit.getPluginManager().callEvent(event);
|
|
+ if (!event.isCancelled()) {
|
|
+ worldserver.setDayTime(worldserver.getDayTime() + event.getSkipAmount());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
commandlistenerwrapper.getServer().forceTimeSynchronization();
|