From f5d5dce79148ffdce539020463c7b60e311ced2e Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Thu, 30 Mar 2023 10:34:15 -0400
Subject: [PATCH] Revert "Fidality borking mobs in buildings unborked."

This reverts commit 2befa063ef2e47db3d468ed48d108d2c5c3f6d6e.
---
 src/engine/devcmd/cmds/InfoCmd.java          |  3 +-
 src/engine/net/client/ClientMessagePump.java | 12 +++++++-
 src/engine/objects/Mob.java                  | 31 +++++---------------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/engine/devcmd/cmds/InfoCmd.java b/src/engine/devcmd/cmds/InfoCmd.java
index c44d413b..656e7520 100644
--- a/src/engine/devcmd/cmds/InfoCmd.java
+++ b/src/engine/devcmd/cmds/InfoCmd.java
@@ -455,7 +455,8 @@ public class InfoCmd extends AbstractDevCmd {
 
 			output += newline;
 			output += "Speed : " + targetMob.getSpeed();
-
+			output += newline;
+			output += "Fidelity ID: " + targetMob.getFidalityID();
 			output += newline;
 			output += "EquipSet: " + targetMob.getEquipmentSetID();
 			output += newline;
diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java
index ded3913a..adbe76ee 100644
--- a/src/engine/net/client/ClientMessagePump.java
+++ b/src/engine/net/client/ClientMessagePump.java
@@ -1130,7 +1130,7 @@ public class ClientMessagePump implements NetMsgHandler {
 							//Take equipment off mob
 							if (tar.getObjectType() == GameObjectType.Mob && itemRet != null){
 								Mob mobTarget = (Mob)tar;
-
+								if (mobTarget.getFidalityID() != 0){
 									if (item != null && item.getObjectType() == GameObjectType.MobLoot){
 										int fidelityEquipID = ((MobLoot)item).getFidelityEquipID();
 
@@ -1148,10 +1148,20 @@ public class ClientMessagePump implements NetMsgHandler {
 												}
 											}
 										}
+
+
+									}
 								}
+
+
 							}
 						}
+
+					}
+					else {
+
 					}
+
 				}
 				else if (targetType == GameObjectType.Corpse.ordinal()) {
 					corpse = Corpse.getCorpse(targetID);
diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java
index d148fe03..81d9dde0 100644
--- a/src/engine/objects/Mob.java
+++ b/src/engine/objects/Mob.java
@@ -1257,32 +1257,17 @@ public class Mob extends AbstractIntelligenceAgent {
         return this.parentZone;
     }
 
-
-
     public void setParentZone(Zone zone) {
 
-            if (this.parentZone == null){
-                zone.zoneMobSet.add(this);
-                this.parentZone = zone;
-            }
-
-            if (this.building != null) {
-
-                Vector3fImmutable localLoc = new Vector3fImmutable(this.statLat,this.statAlt,this.statLon);
-                Vector3fImmutable buildingWorldLoc = ZoneManager.convertLocalToWorld(this.building, localLoc);
-                this.setBindLoc(buildingWorldLoc);
-                this.setLoc(buildingWorldLoc);
-                this.stopMovement(buildingWorldLoc);
-                return;
-            }
-
-                Vector3fImmutable localLoc = new Vector3fImmutable(this.statLat + zone.absX, this.statAlt + zone.absY, this.statLon + zone.absZ);
-                Vector3fImmutable spawnRadiusLoc = Vector3fImmutable.getRandomPointInCircle(localLoc, this.spawnRadius);
-
-                this.setBindLoc(spawnRadiusLoc);
-                this.setLoc(spawnRadiusLoc);
-                this.stopMovement(spawnRadiusLoc);
+        if (this.parentZone == null) {
+            zone.zoneMobSet.add(this);
+            this.parentZone = zone;
+        }
 
+        this.bindLoc = Mob.GetSpawnRadiusLocation(this);
+        this.lastBindLoc = bindLoc;
+        this.setLoc(bindLoc);
+        this.stopMovement(bindLoc);
     }
 
     public int getParentZoneID() {