Fix Apotheosis mixin conflict (#626 #784)

IzzelAliz · Oct 29, 2022 · fd3be88 · fd3be88
1 parent 704a908
commit fd3be88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...mon/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java b/...mon/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java
@@ -219,7 +219,7 @@ public abstract class LivingEntityMixin extends EntityMixin implements LivingEnt
     protected void dropExperience() {
         // if (!this.world.isRemote && (this.isPlayer() || this.recentlyHit > 0 && this.canDropLoot() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT))) {
         if (true) {
-            int reward = ForgeEventFactory.getExperienceDrop((LivingEntity)(Object) this, this.lastHurtByPlayer, this.expToDrop);
+            int reward = ForgeEventFactory.getExperienceDrop((LivingEntity) (Object) this, this.lastHurtByPlayer, this.expToDrop);
             ExperienceOrb.award((ServerLevel) this.level, this.position(), reward);
             bridge$setExpToDrop(0);
         }
@@ -938,9 +938,13 @@ private boolean checkTotemDeathProtection(DamageSource damageSourceIn) {
     public void arclight$muteDamageArmor(LivingEntity entity, DamageSource damageSource, float damage) {
     }
 
-    @Redirect(method = "getDamageAfterMagicAbsorb", require = 0, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;hasEffect(Lnet/minecraft/world/effect/MobEffect;)Z"))
-    public boolean arclight$mutePotion(LivingEntity livingEntity, MobEffect potionIn) {
-        return false;
+    @Mixin(value = LivingEntity.class, priority = 1500)
+    public static class ApotheosisCompatMixin {
+
+        @Redirect(method = "getDamageAfterMagicAbsorb", require = 0, at = @At(value = "INVOKE", ordinal = 0, target = "Lnet/minecraft/world/entity/LivingEntity;hasEffect(Lnet/minecraft/world/effect/MobEffect;)Z"))
+        public boolean arclight$mutePotion(LivingEntity livingEntity, MobEffect potionIn) {
+            return false;
+        }
     }
 
     @Redirect(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;setSharedFlag(IZ)V"))

diff --git a/arclight-common/src/main/resources/mixins.arclight.core.json b/arclight-common/src/main/resources/mixins.arclight.core.json
@@ -96,6 +96,7 @@
     "world.entity.ItemBaseSteeringMixin",
     "world.entity.LightningBoltMixin",
     "world.entity.LivingEntityMixin",
+    "world.entity.LivingEntityMixin$ApotheosisCompatMixin",
     "world.entity.MobMixin",
     "world.entity.PathfinderMobMixin",
     "world.entity.ai.attributes.RangedAttributeMixin",