2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-02 16:49:03 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Bugfix: NPC Combat and Damage Application (#541)

Browse Source
This commit is contained in:
MatthewBishop
2023-01-25 20:48:54 -05:00
committed by GitHub
parent 1ad531d244
commit 8cf8a4db2c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java
+7 -6
View File
@@ -653,15 +653,16 @@ public class NpcCombat {
if (damage > 0) { if (damage > 0) {
c.getCombatAssistant().applyRecoilNPC(c, damage, i); c.getCombatAssistant().applyRecoilNPC(c, damage, i);
} }
if (c.playerLevel[GameConstants.HITPOINTS] - damage < 0) {
damage = c.playerLevel[GameConstants.HITPOINTS];
}
int difference = c.playerLevel[GameConstants.HITPOINTS] - damage;
if (c.getPlayerAssistant().savePlayer()) { if (c.getPlayerAssistant().savePlayer()) {
c.getPlayerAssistant().handleROL(); c.getPlayerAssistant().handleROL();
} else if (difference <= c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS]) / 10 && difference > 0) {
c.appendRedemption();
} else { } else {
int difference = c.playerLevel[GameConstants.HITPOINTS] - damage;
if (difference <= c.getLevelForXP(c.playerXP[GameConstants.HITPOINTS]) / 10 && difference > 0) {
c.appendRedemption();
}
if (c.playerLevel[GameConstants.HITPOINTS] - damage < 0) {
damage = c.playerLevel[GameConstants.HITPOINTS];
}
NpcHandler.handleSpecialEffects(c, i, damage); NpcHandler.handleSpecialEffects(c, i, damage);
c.logoutDelay = System.currentTimeMillis(); // logout delay c.logoutDelay = System.currentTimeMillis(); // logout delay
c.handleHitMask(damage); c.handleHitMask(damage);