forked from MagicBane/Server
duplicate zoneMobSet additions fixed
This commit is contained in:
@@ -918,10 +918,10 @@ public class NPC extends AbstractCharacter {
|
||||
if (this.parentZone != null) {
|
||||
if (zone.getObjectUUID() != this.parentZone.getObjectUUID()) {
|
||||
this.parentZone.zoneNPCSet.remove(this);
|
||||
zone.zoneNPCSet.add(this);
|
||||
//zone.zoneNPCSet.add(this);
|
||||
}
|
||||
} else {
|
||||
zone.zoneNPCSet.add(this);
|
||||
//zone.zoneNPCSet.add(this);
|
||||
}
|
||||
} else if (this.parentZone != null) {
|
||||
this.parentZone.zoneNPCSet.remove(this);
|
||||
@@ -988,6 +988,9 @@ public class NPC extends AbstractCharacter {
|
||||
if (npcWithoutID.mobBase == null) {
|
||||
return null;
|
||||
}
|
||||
if (parent != null) {
|
||||
npcWithoutID.setRelPos(parent, spawn.x - parent.absX, spawn.y - parent.absY, spawn.z - parent.absZ);
|
||||
}
|
||||
NPC npc;
|
||||
try {
|
||||
npc = DbManager.NPCQueries.ADD_NPC(npcWithoutID, isMob);
|
||||
|
||||
Reference in New Issue
Block a user