Fix resistance potion modifiers not being reapplied

XXMA16 · Mar 3, 2023 · 51424e8 · 51424e8
1 parent c6f2f5d
commit 51424e8
Showing 1 changed file with 32 additions and 0 deletions.
diff --git a/src/main/java/com/charles445/rltweaker/handler/PotionCoreHandler.java b/src/main/java/com/charles445/rltweaker/handler/PotionCoreHandler.java
@@ -6,12 +6,16 @@
 import com.charles445.rltweaker.util.CriticalException;
 import com.charles445.rltweaker.util.ErrorUtil;
 
+import meldexun.reflectionutil.ReflectionField;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.ai.attributes.IAttribute;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
+import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.living.LivingEvent;
 import net.minecraftforge.event.entity.living.PotionEvent.PotionApplicableEvent;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
@@ -26,6 +30,7 @@ public class PotionCoreHandler
 
 	public PotionCoreHandler()
 	{
+		MinecraftForge.EVENT_BUS.register(this);
 		try
 		{
 			if(ModConfig.server.potioncore.capJumpBoost)
@@ -141,4 +146,31 @@ public void potionApplicable(PotionApplicableEvent event)
 			}
 		}
 	}
+
+	public static final ReflectionField<IAttribute> DAMAGE_RESISTANCE = new ReflectionField<>(
+			"com.tmtravlr.potioncore.PotionCoreAttributes", "DAMAGE_RESISTANCE", "DAMAGE_RESISTANCE");
+
+	@SubscribeEvent
+	public void onEntityJoinWorldEvent(EntityJoinWorldEvent event) {
+		if (!DAMAGE_RESISTANCE.isPresent()) {
+			return;
+		}
+		if (!ModConfig.patches.patchPotionCoreResistance) {
+			return;
+		}
+		if (event.getEntity().world.isRemote) {
+			return;
+		}
+		if (!(event.getEntity() instanceof EntityLivingBase)) {
+			return;
+		}
+		EntityLivingBase entity = (EntityLivingBase) event.getEntity();
+		PotionEffect potionEffect = entity.getActivePotionEffect(MobEffects.RESISTANCE);
+		if (potionEffect != null) {
+			Potion potion = potionEffect.getPotion();
+			potion.removeAttributesModifiersFromEntity(entity, entity.getAttributeMap(), potionEffect.getAmplifier());
+			potion.applyAttributesModifiersToEntity(entity, entity.getAttributeMap(), potionEffect.getAmplifier());
+		}
+	}
+
 }