2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/server/commands/CommandTime.java
|
|
|
|
+++ b/net/minecraft/server/commands/CommandTime.java
|
|
|
|
@@ -10,6 +10,11 @@
|
|
|
|
import net.minecraft.network.chat.ChatMessage;
|
|
|
|
import net.minecraft.server.level.WorldServer;
|
2021-03-08 22:47:33 +01:00
|
|
|
|
2019-12-21 02:06:18 +01:00
|
|
|
+// CraftBukkit start
|
|
|
|
+import org.bukkit.Bukkit;
|
|
|
|
+import org.bukkit.event.world.TimeSkipEvent;
|
2021-03-08 22:47:33 +01:00
|
|
|
+// CraftBukkit end
|
|
|
|
+
|
2019-12-21 02:06:18 +01:00
|
|
|
public class CommandTime {
|
2020-06-25 02:00:00 +02:00
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
public CommandTime() {}
|
|
|
|
@@ -53,7 +58,13 @@
|
2019-12-21 02:06:18 +01: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
|
|
|
|
}
|
|
|
|
|
|
|
|
commandlistenerwrapper.sendMessage(new ChatMessage("commands.time.set", new Object[]{i}), true);
|
2021-06-11 07:00:00 +02:00
|
|
|
@@ -66,7 +77,13 @@
|
2019-12-21 02:06:18 +01: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
|
|
|
|
}
|
|
|
|
|
|
|
|
int j = a(commandlistenerwrapper.getWorld());
|