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

Merge branch 'fix-tds-melee' into 'master'

Browse Source 
Explicitly set the combat style from the NPC config instead of assuming the default is melee.

See merge request 2009scape/2009scape!259
This commit is contained in:
Ceikry
2021-09-14 22:36:37 +00:00
parent 6a3d1858d3 4039ce65f1
commit 5033df9417
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/node/entity/npc/NPC.java
+3 -3
View File
@@ -628,10 +628,10 @@ public class NPC extends Entity {
} }
getProperties().setAttackStyle(new WeaponInterface.AttackStyle(WeaponInterface.STYLE_CONTROLLED, index)); getProperties().setAttackStyle(new WeaponInterface.AttackStyle(WeaponInterface.STYLE_CONTROLLED, index));
CombatStyle style = getDefinition().getConfiguration(NPCConfigParser.COMBAT_STYLE); CombatStyle style = getDefinition().getConfiguration(NPCConfigParser.COMBAT_STYLE);
if (style == CombatStyle.RANGE) { if (style != null) {
getProperties().getCombatPulse().setStyle(style);
} else if (style == CombatStyle.MAGIC) {
getProperties().getCombatPulse().setStyle(style); getProperties().getCombatPulse().setStyle(style);
}
if (style == CombatStyle.MAGIC) {
getProperties().setAutocastSpell(new DefaultCombatSpell(this)); getProperties().setAutocastSpell(new DefaultCombatSpell(this));
int spell = definition.getConfiguration("spell_id", -1); int spell = definition.getConfiguration("spell_id", -1);
if (spell != -1) { if (spell != -1) {