From f67998dc48ec51ee549cd8440547ee29358d1adc Mon Sep 17 00:00:00 2001
From: glowredman <35727266+glowredman@users.noreply.github.com>
Date: Mon, 4 Dec 2023 20:33:18 +0100
Subject: [PATCH] Achievementhandler Fixes (#770)

* Add check for BM and Avaritia

* Only execute onEntityUpdate on the logical server
---
 .../com/dreammaster/amazingtrophies/AchievementHandler.java    | 3 ++-
 src/main/java/com/dreammaster/main/MainRegistry.java           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java b/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java
index 0700643dd..ab62c3d68 100644
--- a/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java
+++ b/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java
@@ -18,6 +18,7 @@
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent;
+import cpw.mods.fml.relauncher.Side;
 import fox.spiteful.avaritia.items.LudicrousItems;
 
 public class AchievementHandler {
@@ -50,7 +51,7 @@ public static void init() {
 
     @SubscribeEvent
     public void onEntityUpdate(PlayerTickEvent event) {
-        if (event.phase == Phase.START) {
+        if (event.side == Side.CLIENT || event.phase == Phase.START) {
             return;
         }
 
diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java
index 733f316fe..2fc567c93 100644
--- a/src/main/java/com/dreammaster/main/MainRegistry.java
+++ b/src/main/java/com/dreammaster/main/MainRegistry.java
@@ -486,7 +486,7 @@ public void CompleteLoad(FMLLoadCompleteEvent event) {
             BW_RadHatchMaterial.runRadHatchAdder();
         }
         if (Thaumcraft.isModLoaded()) TCLoader.checkRecipeProblems();
-        if (Loader.isModLoaded("amazingtrophies")) {
+        if (Loader.isModLoaded("amazingtrophies") && BloodMagic.isModLoaded() && Avaritia.isModLoaded()) {
             AchievementHandler.init();
             AchievementHandler handler = new AchievementHandler();
             MinecraftForge.EVENT_BUS.register(handler);