Fixes to CombatSystem in udon. How long has this been broken?

CyanLaser · May 4, 2021 · 8dbd4da · 8dbd4da
1 parent b2e057e
commit 8dbd4da
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/CyanEmu/Scripts/VRCSDK2/CyanEmuCombatSystemHelper.cs b/CyanEmu/Scripts/VRCSDK2/CyanEmuCombatSystemHelper.cs
@@ -83,16 +83,16 @@ public static IVRC_Destructible CombatGetDestructible(VRCPlayerApi player)
 
         public static void CombatSetCurrentHitpoints(VRCPlayerApi player, float health)
         {
-            bool less = health < instance.currentHealth_;
-            instance.currentHealth_ = health;
-            if (less)
+            float delta = health - instance.currentHealth_;
+            if (delta <= 0)
             {
-                instance.ApplyDamage(0);
+                instance.ApplyDamage(-delta);
             }
             else
             {
-                instance.ApplyHealing(0);
+                instance.ApplyHealing(delta);
             }
+            instance.currentHealth_ = health;
         }
 
         private void Awake()
@@ -151,7 +151,14 @@ private void ApplyVisualDamage()
         {
             if (visualDamage_ != null)
             {
-                visualDamage_.SetDamagePercent(1 - (currentHealth_ / maxPlayerHealth_));
+                try
+                {
+                    visualDamage_.SetDamagePercent(1 - (currentHealth_ / maxPlayerHealth_));
+                }
+                catch (Exception e)
+                {
+                    this.LogWarning("Error applying damage: "+ e);
+                }
             }
         }