2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-21 09:02:07 -07:00
Code Issues Projects Releases Packages 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
commit dbc0fc756a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Server/src/main/java/core/game/node/entity/npc/NPC.java
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); getProperties().getCombatPulse().setStyle(style);
} else if (style == CombatStyle.MAGIC) { }
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) {