From 7f9df24f97ae99aef130b2fb48a4ebc1fcfe0492 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 7 Jan 2017 16:13:46 +0000 Subject: [PATCH] prevent gods kick wars using the new god level variable --- OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index b7ae298626..8116b3c54c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs @@ -194,14 +194,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods int godlevel = 200; // update level so higher gods can kick lower ones ScenePresence god = m_scene.GetScenePresence(godID); - if(god != null && god.GodController.GodLevel > godlevel) - godlevel = god.GodController.GodLevel; + if(god != null && god.GodController.EffectiveLevel > godlevel) + godlevel = god.GodController.EffectiveLevel; if(agentID == ALL_AGENTS) { 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); }); return; @@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods return; } - if (godlevel <= sp.GodController.GodLevel) // no god wars + if (godlevel <= sp.GodController.EffectiveLevel) // no god wars return; if(sp.UUID == godID)