diff options
author | UbitUmarov | 2017-01-07 16:13:46 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-07 16:13:46 +0000 |
commit | 7f9df24f97ae99aef130b2fb48a4ebc1fcfe0492 (patch) | |
tree | e69ec0705d2b7c4f490998288345baf040624c87 /OpenSim | |
parent | more changes to god level control. Not that this is work in progress, for now... (diff) | |
download | opensim-SC_OLD-7f9df24f97ae99aef130b2fb48a4ebc1fcfe0492.zip opensim-SC_OLD-7f9df24f97ae99aef130b2fb48a4ebc1fcfe0492.tar.gz opensim-SC_OLD-7f9df24f97ae99aef130b2fb48a4ebc1fcfe0492.tar.bz2 opensim-SC_OLD-7f9df24f97ae99aef130b2fb48a4ebc1fcfe0492.tar.xz |
prevent gods kick wars using the new god level variable
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index b7ae298..8116b3c 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 | |||
194 | int godlevel = 200; | 194 | int godlevel = 200; |
195 | // update level so higher gods can kick lower ones | 195 | // update level so higher gods can kick lower ones |
196 | ScenePresence god = m_scene.GetScenePresence(godID); | 196 | ScenePresence god = m_scene.GetScenePresence(godID); |
197 | if(god != null && god.GodController.GodLevel > godlevel) | 197 | if(god != null && god.GodController.EffectiveLevel > godlevel) |
198 | godlevel = god.GodController.GodLevel; | 198 | godlevel = god.GodController.EffectiveLevel; |
199 | 199 | ||
200 | if(agentID == ALL_AGENTS) | 200 | if(agentID == ALL_AGENTS) |
201 | { | 201 | { |
202 | m_scene.ForEachRootScenePresence(delegate(ScenePresence p) | 202 | m_scene.ForEachRootScenePresence(delegate(ScenePresence p) |
203 | { | 203 | { |
204 | if (p.UUID != godID && godlevel > p.GodController.GodLevel) | 204 | if (p.UUID != godID && godlevel > p.GodController.EffectiveLevel) |
205 | doKickmodes(godID, p, kickflags, reason); | 205 | doKickmodes(godID, p, kickflags, reason); |
206 | }); | 206 | }); |
207 | return; | 207 | return; |
@@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
224 | return; | 224 | return; |
225 | } | 225 | } |
226 | 226 | ||
227 | if (godlevel <= sp.GodController.GodLevel) // no god wars | 227 | if (godlevel <= sp.GodController.EffectiveLevel) // no god wars |
228 | return; | 228 | return; |
229 | 229 | ||
230 | if(sp.UUID == godID) | 230 | if(sp.UUID == godID) |