From 5eb5c34636db68aae24ba39498f6efae7a8952b3 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Thu, 13 Jun 2024 17:11:04 -0700
Subject: [PATCH] Fix ClientTickEvent not firing properly.

---
 .../event/ForgeEventFactory.java               |  4 ++--
 .../net/minecraftforge/event/TickEvent.java    | 18 ++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
index aeff455910..3f0106a630 100644
--- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
+++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
@@ -823,11 +823,11 @@ public final class ForgeEventFactory {
     }
 
     public static void onPreClientTick() {
-        post(TickEvent.ClientTickEvent.Pre.get());
+        post(new TickEvent.ClientTickEvent.Pre());
     }
 
     public static void onPostClientTick() {
-        post(TickEvent.ClientTickEvent.Post.get());
+        post(new TickEvent.ClientTickEvent.Post());
     }
 
     public static void onPreServerTick(BooleanSupplier haveTime, MinecraftServer server) {
diff --git a/src/main/java/net/minecraftforge/event/TickEvent.java b/src/main/java/net/minecraftforge/event/TickEvent.java
index c99630c5f3..fec04ede7e 100644
--- a/src/main/java/net/minecraftforge/event/TickEvent.java
+++ b/src/main/java/net/minecraftforge/event/TickEvent.java
@@ -86,29 +86,15 @@ public class TickEvent extends Event {
         }
 
         public static class Pre extends ClientTickEvent {
-
-            private static final Pre INSTANCE = new Pre();
-
-            private Pre() {
+            public Pre() {
                 super(Phase.START);
             }
-
-            public static Pre get() {
-                return INSTANCE;
-            }
         }
 
         public static class Post extends ClientTickEvent {
-
-            private static final Post INSTANCE = new Post();
-
-            private Post() {
+            public Post() {
                 super(Phase.END);
             }
-
-            public static Post get() {
-                return INSTANCE;
-            }
         }
     }