craftbukkit/nms-patches/net/minecraft/server/commands/CommandTime.patch

45 lines
1.7 KiB
Diff
Raw Normal View History

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 @@
2021-03-16 09:00:00 +11:00
import net.minecraft.network.chat.ChatMessage;
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() {}
2021-11-22 09:00:00 +11:00
@@ -52,7 +57,13 @@
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
}
2021-11-22 09:00:00 +11:00
commandlistenerwrapper.sendSuccess(new ChatMessage("commands.time.set", new Object[]{i}), true);
@@ -65,7 +76,13 @@
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());