upstream/Avaritia
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Avaritia.git synced 2026-10-25 20:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change InfinitySword execution & damage behavior (#87)

Browse Source
This commit is contained in:
M R S E authored and GitHub committed 2026-10-07 20:34:18 +00:00
1 parent f02c7bfe69
commit 8e87ad1e4d
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java
+2 -2
View File
@@ -50,8 +50,8 @@ public class ItemSwordInfinity extends ItemSword implements ICosmicRenderItem, I
@Override
public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase player) {
if (player.worldObj.isRemote) return true;
float attackDamage = InfinityToolRuntimeHelpers.getSwordDamage(stack);
boolean executionEnabled = InfinityToolRuntimeHelpers.isSwordExecutionEnabled(stack);
float attackDamage = executionEnabled ? Float.MAX_VALUE : InfinityToolRuntimeHelpers.getSwordDamage(stack);
if (victim instanceof EntityPlayer pvp) {
if (LudicrousItems.isInfinite(pvp)) {
if (Belmont.isVampire(pvp)) victim.attackEntityFrom(
@@ -68,7 +68,7 @@ public class ItemSwordInfinity extends ItemSword implements ICosmicRenderItem, I
victim.recentlyHit = 60;
victim.func_110142_aN() // getCombatTracker
.func_94547_a(new DamageSourceInfinitySword(player), victim.getHealth(), victim.getHealth());
if (executionEnabled && attackDamage >= victim.getHealth()) {
if (executionEnabled) {
victim.setHealth(0);
if (Belmont.isVampire(victim)) victim.onDeath(new EntityDamageSource("infinity", player).setFireDamage());
else victim.onDeath(new EntityDamageSource("infinity", player));