Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

null check for building owner.

Browse Source
This commit is contained in:
MagicBot
2023-05-01 14:10:09 -04:00
parent 59cd2b0dc1
commit c0521ba2b7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/NPC.java
+6 -2
View File
@@ -240,9 +240,13 @@ public class NPC extends AbstractCharacter {
submitUpgradeJob(); submitUpgradeJob();
this.name = rs.getString("npc_name"); this.name = rs.getString("npc_name");
if(this.building != null && this.building.getOwner().getObjectType().equals(GameObjectType.PlayerCharacter)){
// Name override for player owned npcs
if (this.building != null &&
this.building.getOwner() != null &&
this.building.getOwner().getObjectType().equals(GameObjectType.PlayerCharacter))
this.name += " the " + this.contract.getName(); this.name += " the " + this.contract.getName();
}
}catch(Exception e){ }catch(Exception e){
Logger.error(e); Logger.error(e);