aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorRevolution2010-01-21 18:12:40 -0600
committerMelanie2010-01-21 23:30:49 +0000
commit14e62c096d571a47abffd1a954c1a949300f156c (patch)
tree852e04ab3c90fe3842c02d87d0c23f0060e8307d /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-14e62c096d571a47abffd1a954c1a949300f156c.zip
opensim-SC_OLD-14e62c096d571a47abffd1a954c1a949300f156c.tar.gz
opensim-SC_OLD-14e62c096d571a47abffd1a954c1a949300f156c.tar.bz2
opensim-SC_OLD-14e62c096d571a47abffd1a954c1a949300f156c.tar.xz
Fixes llSetDamage. Patch from Revolution
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs12
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8545425..39a2c65 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3236,17 +3236,15 @@ namespace OpenSim.Region.Framework.Scenes
3236 uint killerObj = 0; 3236 uint killerObj = 0;
3237 foreach (uint localid in coldata.Keys) 3237 foreach (uint localid in coldata.Keys)
3238 { 3238 {
3239 if (coldata[localid].PenetrationDepth <= 0.10f || m_invulnerable) 3239 SceneObjectPart part = Scene.GetSceneObjectPart(localid);
3240 continue;
3241 //if (localid == 0)
3242 //continue;
3243
3244 SceneObjectPart part = m_scene.GetSceneObjectPart(localid);
3245 3240
3246 if (part != null && part.ParentGroup.Damage != -1.0f) 3241 if (part != null && part.ParentGroup.Damage != -1.0f)
3247 Health -= part.ParentGroup.Damage; 3242 Health -= part.ParentGroup.Damage;
3248 else 3243 else
3249 Health -= coldata[localid].PenetrationDepth * 5.0f; 3244 {
3245 if (coldata[localid].PenetrationDepth >= 0.10f)
3246 Health -= coldata[localid].PenetrationDepth * 5.0f;
3247 }
3250 3248
3251 if (Health <= 0.0f) 3249 if (Health <= 0.0f)
3252 { 3250 {