Check if world is remote so event isn't fired for single player entit…

…y tick
beetxp · Aug 21, 2019 · ba21f91 · ba21f91
1 parent 710c0a6
commit ba21f91
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/com/matt/forgehax/mods/services/LocalPlayerUpdateEventService.java b/src/main/java/com/matt/forgehax/mods/services/LocalPlayerUpdateEventService.java
@@ -1,5 +1,8 @@
 package com.matt.forgehax.mods.services;
 
+import static com.matt.forgehax.Helper.getLocalPlayer;
+import static com.matt.forgehax.Helper.getWorld;
+
 import com.matt.forgehax.events.LocalPlayerUpdateEvent;
 import com.matt.forgehax.util.mod.ServiceMod;
 import com.matt.forgehax.util.mod.loader.RegisterMod;
@@ -17,7 +20,9 @@ public LocalPlayerUpdateEventService() {
 
   @SubscribeEvent
   public void onUpdate(LivingEvent.LivingUpdateEvent event) {
-    if (MC.world != null && event.getEntityLiving().equals(MC.player)) {
+    if (getWorld() != null
+        && !getWorld().isRemote
+        && event.getEntityLiving().equals(getLocalPlayer())) {
       Event ev = new LocalPlayerUpdateEvent(event.getEntityLiving());
       MinecraftForge.EVENT_BUS.post(ev);
       event.setCanceled(ev.isCanceled());