From 22144eb8f74207fedb1042cbcf9f7ade3e2eca59 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 9 Nov 2010 20:18:36 +0100
Subject: Fix parcel bans to work only on the avatars they're supposed to work
 on instead of pushing all avatars, even the ones that are allowed.

---
 .../CoreModules/World/Land/LandManagementModule.cs | 29 +++++++++++-----------
 OpenSim/Region/Framework/Scenes/Scene.cs           |  1 -
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 634685a..695202f 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -88,7 +88,8 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         // caches ExtendedLandData
         private Cache parcelInfoCache;
-        private Vector3? forcedPosition = null;
+        private Dictionary<UUID, Vector3> forcedPosition =
+                new Dictionary<UUID, Vector3>();
 
         #region INonSharedRegionModule Members
 
@@ -177,7 +178,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         void ClientOnPreAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
         {
             //If we are forcing a position for them to go
-            if (forcedPosition != null)
+            if (forcedPosition.ContainsKey(remoteClient.AgentId))
             {
                 ScenePresence clientAvatar = m_scene.GetScenePresence(remoteClient.AgentId);
 
@@ -187,23 +188,23 @@ namespace OpenSim.Region.CoreModules.World.Land
 
 
                 //Make sure we stop if they get about to the right place to prevent yoyo and prevents getting stuck on banlines
-                if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition.Value) < .2)
+                if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]) < .2)
                 {
-                    Debug.WriteLine(string.Format("Stopping force position because {0} is close enough to position {1}", forcedPosition.Value, clientAvatar.AbsolutePosition));
-                    forcedPosition = null;
+                    Debug.WriteLine(string.Format("Stopping force position because {0} is close enough to position {1}", forcedPosition[remoteClient.AgentId], clientAvatar.AbsolutePosition));
+                    forcedPosition.Remove(remoteClient.AgentId);
                 }
                 //if we are far away, teleport
-                else if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition.Value) > 3)
+                else if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]) > 3)
                 {
-                    Debug.WriteLine(string.Format("Teleporting out because {0} is too far from avatar position {1}", forcedPosition.Value, clientAvatar.AbsolutePosition));
-                    clientAvatar.Teleport(forcedPosition.Value);
-                    forcedPosition = null;
+                    Debug.WriteLine(string.Format("Teleporting out because {0} is too far from avatar position {1}", forcedPosition[remoteClient.AgentId], clientAvatar.AbsolutePosition));
+                    clientAvatar.Teleport(forcedPosition[remoteClient.AgentId]);
+                    forcedPosition.Remove(remoteClient.AgentId);
                 }
                 else
                 {
                     //Forces them toward the forced position we want if they aren't there yet
                     agentData.UseClientAgentPosition = true;
-                    agentData.ClientAgentPosition = forcedPosition.Value;
+                    agentData.ClientAgentPosition = forcedPosition[remoteClient.AgentId];
                 }
             }
         }
@@ -326,7 +327,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (m_scene.Permissions.IsGod(avatar.UUID)) return;
             if (position.HasValue)
             {
-                forcedPosition = position;
+                forcedPosition[avatar.ControllingClient.AgentId] = (Vector3)position;
             }
         }
 
@@ -457,7 +458,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                              parcel.IsBannedFromLand(clientAvatar.UUID))
                     {
                         //once we've sent the message once, keep going toward the target until we are done
-                        if (forcedPosition == null)
+                        if (forcedPosition.ContainsKey(clientAvatar.ControllingClient.AgentId))
                         {
                             SendYouAreBannedNotice(clientAvatar);
                             ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar));
@@ -466,7 +467,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     else if (parcel.IsRestrictedFromLand(clientAvatar.UUID))
                     {
                         //once we've sent the message once, keep going toward the target until we are done
-                        if (forcedPosition == null)
+                        if (forcedPosition.ContainsKey(clientAvatar.ControllingClient.AgentId))
                         {
                             SendYouAreRestrictedNotice(clientAvatar);
                             ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar));
@@ -475,7 +476,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     else
                     {
                         //when we are finally in a safe place, lets release the forced position lock
-                        forcedPosition = null;
+                        forcedPosition.Remove(clientAvatar.ControllingClient.AgentId);
                     }
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 94a773d..c5396d5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4740,7 +4740,6 @@ namespace OpenSim.Region.Framework.Scenes
             Vector3 nearestRegionEdgePoint = GetNearestRegionEdgePosition(avatar);
             //Debug.WriteLine("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString());
             return nearestRegionEdgePoint;
-            return null;
         }
 
         private Vector3 GetParcelCenterAtGround(ILandObject parcel)
-- 
cgit v1.1