From c179e4aaf34252a108570bd315e54c8d332293fd Mon Sep 17 00:00:00 2001 From: MagicBot Date: Fri, 25 Aug 2023 15:29:42 -0400 Subject: [PATCH] Don't override level or name for minions. --- src/engine/objects/Mob.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java index 0d6e5ac0..e6ac03f6 100644 --- a/src/engine/objects/Mob.java +++ b/src/engine/objects/Mob.java @@ -1734,8 +1734,11 @@ public class Mob extends AbstractIntelligenceAgent { this.firstName = this.mobBase.getFirstName(); if (this.contract != null) { + this.equipmentSetID = this.contract.getEquipmentSet(); - this.lastName = this.getContract().getName(); + + if (this.lastName.isEmpty()) + this.lastName = this.getContract().getName(); } this.gridObjectType = GridObjectType.DYNAMIC; @@ -1746,8 +1749,11 @@ public class Mob extends AbstractIntelligenceAgent { this.mana.set(this.manaMax); this.stamina.set(this.staminaMax); + // Don't override level for guard minions + if (this.contract == null) - this.level = (short) this.mobBase.getLevel(); + if (!this.behaviourType.equals(MobBehaviourType.GuardMinion)) + this.level = (short) this.mobBase.getLevel(); //set bonuses