upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-14 01:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MinecraftServer reference to ServerTickEvent (#8765)

Browse Source
This commit is contained in:
Budschie authored and GitHub committed 2022-06-27 20:45:35 -07:00
1 parent 0dcc3d700d
commit 22668ad2c2
3 files changed
+19 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/event/ForgeEventFactory.java
+5 -4
View File
@@ -15,6 +15,7 @@ import com.mojang.authlib.GameProfile;
import com.mojang.brigadier.CommandDispatcher;
import net.minecraft.commands.CommandBuildContext;
import net.minecraft.network.chat.ChatSender;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ReloadableServerResources;
import net.minecraft.server.players.PlayerList;
import net.minecraft.util.RandomSource;
@@ -814,13 +815,13 @@ public class ForgeEventFactory
MinecraftForge.EVENT_BUS.post(new TickEvent.ClientTickEvent(TickEvent.Phase.END));
}
public static void onPreServerTick(BooleanSupplier haveTime)
public static void onPreServerTick(BooleanSupplier haveTime, MinecraftServer server)
{
MinecraftForge.EVENT_BUS.post(new TickEvent.ServerTickEvent(TickEvent.Phase.START, haveTime));
MinecraftForge.EVENT_BUS.post(new TickEvent.ServerTickEvent(TickEvent.Phase.START, haveTime, server));
}
public static void onPostServerTick(BooleanSupplier haveTime)
public static void onPostServerTick(BooleanSupplier haveTime, MinecraftServer server)
{
MinecraftForge.EVENT_BUS.post(new TickEvent.ServerTickEvent(TickEvent.Phase.END, haveTime));
MinecraftForge.EVENT_BUS.post(new TickEvent.ServerTickEvent(TickEvent.Phase.END, haveTime, server));
}
}
src/main/java/net/minecraftforge/event/TickEvent.java
+12 -1
View File
@@ -6,6 +6,7 @@
package net.minecraftforge.event;
import net.minecraft.world.entity.player.Player;
import net.minecraft.server.MinecraftServer;
import java.util.function.BooleanSupplier;
@@ -35,11 +36,13 @@ public class TickEvent extends Event
public static class ServerTickEvent extends TickEvent {
private final BooleanSupplier haveTime;
private final MinecraftServer server;
public ServerTickEvent(Phase phase, BooleanSupplier haveTime)
public ServerTickEvent(Phase phase, BooleanSupplier haveTime, MinecraftServer server)
{
super(Type.SERVER, LogicalSide.SERVER, phase);
this.haveTime = haveTime;
this.server = server;
}
/**
@@ -51,6 +54,14 @@ public class TickEvent extends Event
{
return this.haveTime.getAsBoolean();
}
/**
* {@return the server instance}
*/
public MinecraftServer getServer()
{
return server;
}
}
public static class ClientTickEvent extends TickEvent {