Fretux/Ascend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update WeaponMagicScalingEvents with Projectile import and direct entity check

Browse Source
This commit is contained in:
fretuks
2026-01-08 17:46:42 +01:00
parent 8695fc320d
commit f12eb41ea4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/fretux/ascend/event/WeaponMagicScalingEvents.java
+4 -3
View File
@@ -7,6 +7,7 @@ import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.entity.projectile.AbstractArrow;
import net.minecraft.world.entity.projectile.FireworkRocketEntity; import net.minecraft.world.entity.projectile.FireworkRocketEntity;
import net.minecraft.world.entity.projectile.Projectile;
import net.minecraft.world.entity.projectile.ThrownTrident; import net.minecraft.world.entity.projectile.ThrownTrident;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent;
@@ -72,12 +73,12 @@ public class WeaponMagicScalingEvents {
|| id.equals("indirectMagic") || id.equals("indirectMagic")
|| id.equals("wither") || id.equals("wither")
|| id.equals("dragonBreath") || id.equals("dragonBreath")
|| id.equals("thrown") || id.equals("thrown")
|| id.equals("potion"); || id.equals("potion");
} }
private static boolean isRangedDamage(DamageSource source) { private static boolean isRangedDamage(DamageSource source) {
return source.isProjectile() return source.getDirectEntity() instanceof Projectile
|| source.getDirectEntity() instanceof AbstractArrow || source.getDirectEntity() instanceof AbstractArrow
|| source.getDirectEntity() instanceof ThrownTrident || source.getDirectEntity() instanceof ThrownTrident
|| source.getDirectEntity() instanceof FireworkRocketEntity; || source.getDirectEntity() instanceof FireworkRocketEntity;
@@ -106,4 +107,4 @@ public class WeaponMagicScalingEvents {
return bonus; return bonus;
} }
} }