mantis 6569: restore full health on invulnerable set to true; combat module is outdated and needs work. By then the proposal on this mantis should be reviewed

2019-02-26 13:38:03 +00:00 · 2019-02-26 13:38:03 +00:00 · e24adb9ea1
parent 91569e00a0
commit e24adb9ea1
1 changed files with 6 additions and 1 deletions
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@ -523,7 +523,12 @@ namespace OpenSim.Region.Framework.Scenes

        public bool Invulnerable
        {
-            set { m_invulnerable = value; }
+            set
+            {
+                m_invulnerable = value;
+                if(value && Health != 100.0f)
+                    Health = 100.0f;
+            }
            get { return m_invulnerable; }
        }