ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

simplify combat module

Browse Source
This commit is contained in:
UbitUmarov
2021-10-24 21:49:54 +01:00
parent 74a0bb3837
commit b50b088dba
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
View File

@@ -48,11 +48,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
/// </summary>
//private Dictionary<UUID, UUID> m_rootAgents = new Dictionary<UUID, UUID>();
/// <summary>
/// Scenes by Region Handle
/// </summary>
private Dictionary<ulong, Scene> m_scenel = new Dictionary<ulong, Scene>();
/// <summary>
/// Startup
/// </summary>
@@ -64,26 +59,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
public void AddRegion(Scene scene)
{
lock (m_scenel)
{
if (m_scenel.ContainsKey(scene.RegionInfo.RegionHandle))
{
m_scenel[scene.RegionInfo.RegionHandle] = scene;
}
else
{
m_scenel.Add(scene.RegionInfo.RegionHandle, scene);
}
}
scene.EventManager.OnAvatarKilled += KillAvatar;
}
public void RemoveRegion(Scene scene)
{
if (m_scenel.ContainsKey(scene.RegionInfo.RegionHandle))
m_scenel.Remove(scene.RegionInfo.RegionHandle);
scene.EventManager.OnAvatarKilled -= KillAvatar;
}
@@ -109,12 +89,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
get { return null; }
}
private void KillAvatar(uint killerObjectLocalID, ScenePresence deadAvatar)
{
string deadAvatarMessage;
ScenePresence killingAvatar = null;
// string killingAvatarMessage;
// check to see if it is an NPC and just remove it
if(deadAvatar.IsNPC)