Octol1ttle/Knockdowns-Legacy
1
0
Fork 0
Code Issues Pull requests Activity

fix: account for STUPID mods overriding invulnerability

Browse source 
i love 1.12.2

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2024-07-19 14:52:42 +05:00
parent c5d7692742
commit 7efc2d9af1
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsCommonEventListener.java
View file

@ -5,8 +5,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.MobEffects;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumActionResult;
@ -16,6 +14,7 @@ import net.minecraft.util.text.TextComponentTranslation;
import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.AttachCapabilitiesEvent;
import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent;
import net.minecraftforge.event.entity.player.AttackEntityEvent; import net.minecraftforge.event.entity.player.AttackEntityEvent;
import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerEvent;
@ -123,17 +122,24 @@ public class KnockdownsCommonEventListener {
int period = MathHelper.floor(KNOCKED_HURT_PERIOD * 20); int period = MathHelper.floor(KNOCKED_HURT_PERIOD * 20);
if (data.getTicksKnocked() <= KNOCKED_INVULNERABILITY_TICKS) { if (data.getTicksKnocked() <= KNOCKED_INVULNERABILITY_TICKS) {
knocked.setEntityInvulnerable(true); KnockdownsUtils.setKnockedInitialState(knocked);
knocked.extinguish();
knocked.setAir(300);
KnockdownsUtils.clearBadPotionEffects(knocked);
knocked.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, Integer.MAX_VALUE, 3));
} else if (data.getTicksKnocked() % period == 0) { } else if (data.getTicksKnocked() % period == 0) {
knocked.setEntityInvulnerable(false);
knocked.attackEntityFrom(DamageSource.GENERIC, knocked.getMaxHealth() / (KNOCKED_TENACITY / KNOCKED_HURT_PERIOD)); knocked.attackEntityFrom(DamageSource.GENERIC, knocked.getMaxHealth() / (KNOCKED_TENACITY / KNOCKED_HURT_PERIOD));
} }
} }
@SubscribeEvent
public static void onPlayerHurt(LivingHurtEvent event) {
if (event.getEntityLiving() instanceof EntityPlayerMP) {
EntityPlayerMP knocked = (EntityPlayerMP) event.getEntityLiving();
IKnockdownsPlayerData data = IKnockdownsPlayerData.get(knocked);
if (data.isKnockedDown() && data.getTicksKnocked() <= KNOCKED_INVULNERABILITY_TICKS) {
KnockdownsUtils.setKnockedInitialState(knocked);
event.setCanceled(true);
}
}
}
@SubscribeEvent @SubscribeEvent
public static void onPlayerDeath(LivingDeathEvent event) { public static void onPlayerDeath(LivingDeathEvent event) {
if (!(event.getEntityLiving() instanceof EntityPlayerMP)) { if (!(event.getEntityLiving() instanceof EntityPlayerMP)) {
@ -153,11 +159,8 @@ public class KnockdownsCommonEventListener {
player.setEntityInvulnerable(true); player.setEntityInvulnerable(true);
player.setHealth(1.0f); player.setHealth(1.0f);
player.setAbsorptionAmount(player.getMaxHealth() - 1.0f); player.setAbsorptionAmount(player.getMaxHealth() - 1.0f);
player.extinguish();
player.setAir(300);
player.clearElytraFlying(); player.clearElytraFlying();
KnockdownsUtils.clearBadPotionEffects(player); KnockdownsUtils.setKnockedInitialState(player);
player.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, Integer.MAX_VALUE, 3));
Entity trueSource = event.getSource().getTrueSource(); Entity trueSource = event.getSource().getTrueSource();
if (trueSource instanceof EntityLiving) { if (trueSource instanceof EntityLiving) {

7
src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java
View file

@ -18,6 +18,13 @@ public class KnockdownsUtils {
public static final float KNOCKED_HURT_PERIOD = 1.2f; public static final float KNOCKED_HURT_PERIOD = 1.2f;
public static final float KNOCKED_TENACITY = 60.0f; public static final float KNOCKED_TENACITY = 60.0f;
public static void setKnockedInitialState(EntityPlayerMP player) {
player.extinguish();
player.setAir(300);
KnockdownsUtils.clearBadPotionEffects(player);
player.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, Integer.MAX_VALUE, 3));
}
public static void clearBadPotionEffects(EntityPlayerMP player) { public static void clearBadPotionEffects(EntityPlayerMP player) {
List<Potion> removeList = new ArrayList<>(); List<Potion> removeList = new ArrayList<>();