Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit 6244e95

Browse files
committed
refactor PlayerTick methods to match ClientTick and WorldTick
1 parent c7aed52 commit 6244e95

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

patchwork-events-lifecycle/src/main/java/net/patchworkmc/impl/event/lifecycle/LifecycleEvents.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,8 @@ public static void fireClientTickEvent(TickEvent.Phase phase) {
5555
MinecraftForge.EVENT_BUS.post(new TickEvent.ClientTickEvent(phase));
5656
}
5757

58-
public static void onPlayerPreTick(PlayerEntity player) {
59-
MinecraftForge.EVENT_BUS.post(new TickEvent.PlayerTickEvent(TickEvent.Phase.START, player));
60-
}
61-
62-
public static void onPlayerPostTick(PlayerEntity player) {
63-
MinecraftForge.EVENT_BUS.post(new TickEvent.PlayerTickEvent(TickEvent.Phase.END, player));
58+
public static void firePlayerTickEvent(TickEvent.Phase phase, PlayerEntity player) {
59+
MinecraftForge.EVENT_BUS.post(new TickEvent.PlayerTickEvent(phase, player));
6460
}
6561

6662
public static void handleServerStarting(final MinecraftServer server) {

patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinPlayerEntity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
package net.patchworkmc.mixin.event.lifecycle;
2121

22+
import net.minecraftforge.event.TickEvent;
2223
import org.spongepowered.asm.mixin.Mixin;
2324
import org.spongepowered.asm.mixin.injection.At;
2425
import org.spongepowered.asm.mixin.injection.Inject;
@@ -32,11 +33,11 @@
3233
public class MixinPlayerEntity {
3334
@Inject(method = "tick", at = @At("HEAD"))
3435
public void onPlayerPreTick(CallbackInfo callback) {
35-
LifecycleEvents.onPlayerPreTick((PlayerEntity) (Object) this);
36+
LifecycleEvents.firePlayerTickEvent(TickEvent.Phase.START, (PlayerEntity) (Object) this);
3637
}
3738

3839
@Inject(method = "tick", at = @At("TAIL"))
3940
public void onPlayerPostTick(CallbackInfo callback) {
40-
LifecycleEvents.onPlayerPostTick((PlayerEntity) (Object) this);
41+
LifecycleEvents.firePlayerTickEvent(TickEvent.Phase.END, (PlayerEntity) (Object) this);
4142
}
4243
}

0 commit comments

Comments
 (0)