OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

prevent gods kick wars using the new god level variable

melanie
UbitUmarov 2017-01-07 16:13:46 +00:00
parent d761a20cce
commit 7f9df24f97
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
View File

@ -194,14 +194,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
int godlevel = 200; int godlevel = 200;
// update level so higher gods can kick lower ones // update level so higher gods can kick lower ones
ScenePresence god = m_scene.GetScenePresence(godID); ScenePresence god = m_scene.GetScenePresence(godID);
if(god != null && god.GodController.GodLevel > godlevel) if(god != null && god.GodController.EffectiveLevel > godlevel)
godlevel = god.GodController.GodLevel; godlevel = god.GodController.EffectiveLevel;
if(agentID == ALL_AGENTS) if(agentID == ALL_AGENTS)
{ {
m_scene.ForEachRootScenePresence(delegate(ScenePresence p) m_scene.ForEachRootScenePresence(delegate(ScenePresence p)
{ {
if (p.UUID != godID && godlevel > p.GodController.GodLevel) if (p.UUID != godID && godlevel > p.GodController.EffectiveLevel)
doKickmodes(godID, p, kickflags, reason); doKickmodes(godID, p, kickflags, reason);
}); });
return; return;
@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
return; return;
} }
if (godlevel <= sp.GodController.GodLevel) // no god wars if (godlevel <= sp.GodController.EffectiveLevel) // no god wars
return; return;
if(sp.UUID == godID) if(sp.UUID == godID)