Skip to content

Fix potential side effects for damage tracking by limiting tracked damage to player health. #1896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keraldi wants to merge 1 commit into
base: 1.16.3
Choose a base branch
from
Open

Fix potential side effects for damage tracking by limiting tracked damage to player health. #1896

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,24 +219,30 @@ public void onLivingHurt(LivingHurtEvent event)
PlayerEntity player = (PlayerEntity) living;
if (LivingUtil.hasFullSet(player))
{

event.setAmount((float) LivingUtil.getDamageReceivedForArmour(player, event.getSource(), event.getAmount()));

float trackedDamage = event.getAmount();

if (trackedDamage > player.getHealth())
trackedDamage = player.getHealth();

// The factor of 1.6 is due to taking into account iron armour's protection at
// ~11 damage
double factor = 1.6;
if (event.getSource().isProjectile())
{
// LivingStats stats = LivingStats.fromPlayer(player);
// stats.addExperience(LivingArmorRegistrar.TEST_UPGRADE.get().getKey(), 10);
LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_ARROW_PROTECT.get(), event.getAmount() / factor);
LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_ARROW_PROTECT.get(), trackedDamage / factor);
} else
{
LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_PHYSICAL_PROTECT.get(), event.getAmount() / factor);
LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_PHYSICAL_PROTECT.get(), trackedDamage / factor);
}

if (event.getSource() == DamageSource.FALL)
{
LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_FALL_PROTECT.get(), event.getAmount() / factor);
LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_FALL_PROTECT.get(), trackedDamage / factor);
}
}
}
Expand Down