Merge pull request #679 from P3pp3rF1y/1.20.x-dev

fix: 🐛 Fix mob charm entity tick code to not trigger on client to pre…
P3pp3rF1y · Apr 11, 2024 · 642962e · 642962e
2 parents 21580a6 + cba1d54
commit 642962e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx2048m
 minecraft_version=1.20.1
 forge_version=47.1.5
-mod_version=2.0.40
+mod_version=2.0.41
 jei_mc_version=1.20.1-forge
 jei_version=15.1.0.19
 curios_version=5.2.0-beta.3+1.20.1

diff --git a/src/main/java/reliquary/items/MobCharmItem.java b/src/main/java/reliquary/items/MobCharmItem.java
@@ -101,7 +101,7 @@ private void onEntityTargetedEvent(LivingChangeTargetEvent event) {
 	}
 
 	private void onLivingUpdate(LivingEvent.LivingTickEvent event) {
-		if (!(event.getEntity() instanceof Mob entity)) {
+		if (event.getEntity().level().isClientSide() || !(event.getEntity() instanceof Mob entity)) {
 			return;
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	private void onLivingUpdate(LivingEvent.LivingTickEvent event) {
-    		if (!(event.getEntity() instanceof Mob entity)) {
+    		if (event.getEntity().level().isClientSide() || !(event.getEntity() instanceof Mob entity)) {
     			return;
     		}
@@ Expand Down @@