mirror of
https://gitlab.com/2009scape/2009scape.git
synced 2025-12-16 11:30:17 -07:00
Merge branch 'fix-tds-retaliation' into 'master'
Tormented demons now correctly retaliate if attacked while non-aggressive. See merge request 2009scape/2009scape!256
This commit is contained in:
commit
fc0418e6ba
1 changed files with 2 additions and 0 deletions
|
|
@ -151,6 +151,8 @@ public class TormentedDemonNPC extends AbstractNPC {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onImpact(final Entity entity, BattleState state) {
|
public void onImpact(final Entity entity, BattleState state) {
|
||||||
|
// Call the parent class's onImpact handler to ensure that retaliation happens if the TD is non-aggressive.
|
||||||
|
super.onImpact(entity, state);
|
||||||
// "The demon will switch prayers after it receives 31 damage from one attack style."
|
// "The demon will switch prayers after it receives 31 damage from one attack style."
|
||||||
// This is done in onImpact so that it happens after the damage that caused the switch is dealt.
|
// This is done in onImpact so that it happens after the damage that caused the switch is dealt.
|
||||||
CombatStyle damaged = getMostDamagedStyle();
|
CombatStyle damaged = getMostDamagedStyle();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue