yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve NPC usage of protection prayers.

Browse Source 
- `NPC.hasProtectionPrayer` now accurately reflects protection prayers defined in `npc_configs.json`.
- NPC protection prayers now block 100% of the damage when attacked by a player in `Entity.getFormattedHit` instead of only blocking 40%.
This commit is contained in:
Avi Weinstock
2021-09-12 21:21:36 -04:00
parent cde9c69fdf
commit e9f7b4e515
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/node/entity/Entity.java
+1 -1
View File
@@ -515,7 +515,7 @@ public abstract class Entity extends Node {
Entity victim = state.getVictim(); Entity victim = state.getVictim();
CombatStyle type = state.getStyle(); CombatStyle type = state.getStyle();
if (state.getArmourEffect() != ArmourSet.VERAC && !entity.isIgnoreProtection(type) && victim.hasProtectionPrayer(type)) { if (state.getArmourEffect() != ArmourSet.VERAC && !entity.isIgnoreProtection(type) && victim.hasProtectionPrayer(type)) {
return hit *= entity instanceof Player ? 0.6 : 0; return hit *= (entity instanceof Player && victim instanceof Player) ? 0.6 : 0;
} }
return hit; return hit;
} }
Server/src/main/java/core/game/node/entity/npc/NPC.java
+1 -1
View File
@@ -653,7 +653,7 @@ public class NPC extends Entity {
@Override @Override
public boolean hasProtectionPrayer(CombatStyle style) { public boolean hasProtectionPrayer(CombatStyle style) {
return false; return getProperties().getProtectStyle() == style;
} }
/** /**