lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Possible fix to (many of the) abnormal death events concerning the sacrificial Dagger (#1554)

Browse source 
* Possible fix to (many of the) abnormal death events concerning the sacrifical dagger.

=> #1444

Works with Grim Reaper's Sprint, not tested for anything else.

* Being special, players can survive massive blood loss up until 1 heart remains.

(Math.floor() caused players to die when they sacrificed with 3 health remaining)
This commit is contained in:
Tobias Gremeyer 2019-04-14 15:38:17 +00:00 committed by Nick Ignoffo
parent 7c767b3bbf
commit 572d8eff4f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
View file

@ -94,14 +94,16 @@ public class ItemSacrificialDagger extends ItemEnum<ItemSacrificialDagger.Dagger
return super.onItemRightClick(world, player, hand); return super.onItemRightClick(world, player, hand);
if (evt.shouldDrainHealth) { if (evt.shouldDrainHealth) {
DamageSourceBloodMagic damageSrc = DamageSourceBloodMagic.INSTANCE;
player.hurtResistantTime = 0; player.hurtResistantTime = 0;
player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 0.001F); float playerHealth = player.getHealth();
player.setHealth(Math.max(player.getHealth() - 2, 0.0001f)); if (Math.ceil(player.getHealth() - 2) <= 0) {
if (player.getHealth() <= 0.001f) { player.attackEntityFrom(damageSrc, Float.MAX_VALUE);
player.onDeath(DamageSourceBloodMagic.INSTANCE); } else {
player.setHealth(0); float damageAmount = net.minecraftforge.common.ForgeHooks.onLivingDamage(player, damageSrc, 2.0F);
player.getCombatTracker().trackDamage(damageSrc, playerHealth, damageAmount);
player.setHealth(Math.max(player.getHealth() - 2, 0.001f));
} }
// player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 2.0F);
} }
if (!evt.shouldFillAltar) if (!evt.shouldFillAltar)