2021-03-16 09:00:00 +11:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								--- a/net/minecraft/server/commands/CommandTime.java
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+++ b/net/minecraft/server/commands/CommandTime.java
  
						 
					
						
							
								
									
										
										
										
											2021-11-22 09:00:00 +11:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								@@ -9,6 +9,11 @@
  
						 
					
						
							
								
									
										
										
										
											2022-06-08 02:00:00 +10:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								 import net.minecraft.network.chat.IChatBaseComponent;
							 
						 
					
						
							
								
									
										
										
										
											2021-03-16 09:00:00 +11:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								 import net.minecraft.server.level.WorldServer;
							 
						 
					
						
							
								
									
										
										
										
											2021-03-09 08:47:33 +11:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
									
										
										
										
											2019-12-20 17:06:18 -08:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								+// CraftBukkit start
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.Bukkit;
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+import org.bukkit.event.world.TimeSkipEvent;
  
						 
					
						
							
								
									
										
										
										
											2021-03-09 08:47:33 +11:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								+// CraftBukkit end
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+
  
						 
					
						
							
								
									
										
										
										
											2019-12-20 17:06:18 -08:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								 public class CommandTime {
							 
						 
					
						
							
								
									
										
										
										
											2020-06-25 10:00:00 +10:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
									
										
										
										
											2021-06-11 15:00:00 +10:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								     public CommandTime() {}
							 
						 
					
						
							
								
									
										
										
										
											2022-01-03 08:29:31 +11:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								@@ -47,12 +52,18 @@
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								     }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								     public static int setTime(CommandListenerWrapper commandlistenerwrapper, int i) {
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								-        Iterator iterator = commandlistenerwrapper.getServer().getAllLevels().iterator();
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        Iterator iterator = com.google.common.collect.Iterators.singletonIterator(commandlistenerwrapper.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
									
										
										
										
											2019-12-20 17:06:18 -08:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								         while (iterator.hasNext()) {
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								             WorldServer worldserver = (WorldServer) iterator.next();
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								-            worldserver.setDayTime((long) i);
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+            // CraftBukkit start
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+            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
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								         }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
									
										
										
										
											2022-06-08 02:00:00 +10:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								         commandlistenerwrapper.sendSuccess(IChatBaseComponent.translatable("commands.time.set", i), true);
							 
						 
					
						
							
								
									
										
										
										
											2022-01-03 08:29:31 +11:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								@@ -60,12 +71,18 @@
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								     }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								     public static int addTime(CommandListenerWrapper commandlistenerwrapper, int i) {
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								-        Iterator iterator = commandlistenerwrapper.getServer().getAllLevels().iterator();
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+        Iterator iterator = com.google.common.collect.Iterators.singletonIterator(commandlistenerwrapper.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
									
										
										
										
											2019-12-20 17:06:18 -08:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								         while (iterator.hasNext()) {
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								             WorldServer worldserver = (WorldServer) iterator.next();
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								-            worldserver.setDayTime(worldserver.getDayTime() + (long) i);
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+            // CraftBukkit start
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+            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
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								         }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
									
										
										
										
											2021-11-22 09:00:00 +11:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								         int j = getDayTime(commandlistenerwrapper.getLevel());