Browse Source

Null check was done previously.

magicbox-1.5.2
MagicBot 12 months ago
parent
commit
3775fb336b
  1. 37
      src/engine/objects/NPC.java

37
src/engine/objects/NPC.java

@ -842,7 +842,6 @@ public class NPC extends AbstractCharacter { @@ -842,7 +842,6 @@ public class NPC extends AbstractCharacter {
else
this.guild = Guild.getGuild(this.guildUUID);
if (this.guild == null)
this.guild = Guild.getErrantGuild();
@ -872,27 +871,23 @@ public class NPC extends AbstractCharacter { @@ -872,27 +871,23 @@ public class NPC extends AbstractCharacter {
if (this.building != null)
NPCManager.slotCharacterInBuilding(this);
if (this.contract != null) {
this.symbol = this.contract.getIconID();
this.modTypeTable = this.contract.getNPCModTypeTable();
this.modSuffixTable = this.contract.getNpcModSuffixTable();
this.itemModTable = this.contract.getItemModTable();
int VID = this.contract.getVendorID();
if (VID != 0)
this.vendorID = VID;
else
this.vendorID = 1; //no vendor items
}
this.symbol = this.contract.getIconID();
this.modTypeTable = this.contract.getNPCModTypeTable();
this.modSuffixTable = this.contract.getNpcModSuffixTable();
this.itemModTable = this.contract.getItemModTable();
int VID = this.contract.getVendorID();
if (this.mobBase != null) {
this.healthMax = this.mobBase.getHealthMax();
this.manaMax = 0;
this.staminaMax = 0;
this.setHealth(this.healthMax);
this.mana.set(this.manaMax);
this.stamina.set(this.staminaMax);
}
if (VID != 0)
this.vendorID = VID;
else
this.vendorID = 1; //no vendor items
this.healthMax = this.mobBase.getHealthMax();
this.manaMax = 0;
this.staminaMax = 0;
this.setHealth(this.healthMax);
this.mana.set(this.manaMax);
this.stamina.set(this.staminaMax);
if (this.parentZone.guild_zone)
if (NPC.GetNPCProfits(this) == null)

Loading…
Cancel
Save