Merge remote-tracking branch 'origin/magicbox1.5' into new-booty-system

This commit is contained in:
2023-04-06 19:41:19 -05:00
4 changed files with 44 additions and 7 deletions
+2
View File
@@ -1152,11 +1152,13 @@ public class Mob extends AbstractIntelligenceAgent {
if (newLoc.equals(this.getEndLoc())) {
this.stopMovement(newLoc);
this.region = AbstractWorldObject.GetRegionByWorldObject(this);
return;
//Next upda
}
setLoc(newLoc);
this.region = AbstractWorldObject.GetRegionByWorldObject(this);
//Next update will be end Loc, lets stop him here.
}
+2 -1
View File
@@ -1222,6 +1222,7 @@ public class NPC extends AbstractCharacter {
}catch (Exception e){
Logger.error( e.getMessage());
}
this.region = AbstractWorldObject.GetRegionByWorldObject(this);
}
public void removeFromZone() {
@@ -1461,7 +1462,7 @@ public class NPC extends AbstractCharacter {
mob.setSpawnTime(10);
mob.setNpcOwner(this);
mob.state = STATE.Awake;
mob.region = AbstractWorldObject.GetRegionByWorldObject(mob);
return mob;
}