mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-05 16:49:06 +00:00
Fixes (#293)
- Added ROL for player and npcs - Fixed Redemption now works for players and NPCs - Fixed prayer not updating on prayer tab when it goes down in points - Fixed not being able to use glories after trading them - Fixed item spawn crash (only affected some people such as myself and a few others)
This commit is contained in:
committed by
Daniel Ginovker
parent
37322d4874
commit
87eaaed36f
@@ -2150,16 +2150,6 @@ public class CombatAssistant {
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* public void applyRecoil(int damage, int i) { if (damage > 0 &&
|
||||
* PlayerHandler.players[i].playerEquipment[c.playerRing] == 2550) { int
|
||||
* recDamage = damage / 10 + 1; if (!c.getHitUpdateRequired()) {
|
||||
* c.setHitDiff(recDamage); c.setHitUpdateRequired(true); } else if
|
||||
* (!c.getHitUpdateRequired2()) { c.setHitDiff2(recDamage);
|
||||
* c.setHitUpdateRequired2(true); } c.dealDamage(recDamage);
|
||||
* c.updateRequired = true; } }
|
||||
*/
|
||||
|
||||
public static void applyRecoilNPC(Client c, int damage, int i) {
|
||||
if (c == null || c.npcIndex == 0) {
|
||||
return;
|
||||
|
||||
@@ -665,13 +665,23 @@ public class NpcCombat {
|
||||
if (damage > 0) {
|
||||
CombatAssistant.applyRecoilNPC(c, damage, i);
|
||||
}
|
||||
NpcHandler.handleSpecialEffects(c, i, damage);
|
||||
c.logoutDelay = System.currentTimeMillis(); // logout delay
|
||||
c.handleHitMask(damage);
|
||||
c.playerLevel[3] -= damage;
|
||||
c.getPlayerAssistant().refreshSkill(3);
|
||||
FightCaves.tzKihEffect(c, i, damage);
|
||||
c.updateRequired = true;
|
||||
if (c.playerLevel[3] - damage < 0) {
|
||||
damage = c.playerLevel[3];
|
||||
}
|
||||
int difference = c.playerLevel[3] - damage;
|
||||
if (c.getPlayerAssistant().savePlayer()) {
|
||||
c.getPlayerAssistant().handleROL();
|
||||
} else if (difference <= c.getLevelForXP(c.playerXP[3]) / 10 && difference > 0) {
|
||||
c.appendRedemption();
|
||||
} else {
|
||||
NpcHandler.handleSpecialEffects(c, i, damage);
|
||||
c.logoutDelay = System.currentTimeMillis(); // logout delay
|
||||
c.handleHitMask(damage);
|
||||
c.playerLevel[3] -= damage;
|
||||
c.getPlayerAssistant().refreshSkill(3);
|
||||
FightCaves.tzKihEffect(c, i, damage);
|
||||
c.updateRequired = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user