From 860ac41181b643bc96dbfe2fe39700a955501762 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Thu, 10 Apr 2025 13:08:43 -0500
Subject: [PATCH] handle enabled->disabled->destroyed filters properly

---
 .../data/DamageModel/scripts/server/shapeBase.tscript  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Templates/BaseGame/game/data/DamageModel/scripts/server/shapeBase.tscript b/Templates/BaseGame/game/data/DamageModel/scripts/server/shapeBase.tscript
index 336f41861..2a1b01fae 100644
--- a/Templates/BaseGame/game/data/DamageModel/scripts/server/shapeBase.tscript
+++ b/Templates/BaseGame/game/data/DamageModel/scripts/server/shapeBase.tscript
@@ -177,7 +177,7 @@ function ShapeBaseData::setDamageDirection(%this, %obj, %sourceObject, %damagePo
 
 function ShapeBaseData::onCollision(%this, %obj, %collObj, %vec, %len )
 {
-   if ((!isObject(%obj) || %obj.getDamageState() !$= "Enabled"))
+   if (!isObject(%obj) || %obj.getDamageState() $= "Destroyed")
       return;
       
     //echo(%this SPC %obj SPC %collObj SPC %vec SPC %len );
@@ -189,7 +189,7 @@ function ShapeBaseData::onCollision(%this, %obj, %collObj, %vec, %len )
 
 function ShapeBaseData::onImpact(%this, %obj, %collObj, %vec, %len )
 {
-   if ((!isObject(%obj) || %obj.getDamageState() !$= "Enabled"))
+   if (!isObject(%obj) || %obj.getDamageState() $= "Destroyed")
       return;
       
     //echo(%this SPC %obj SPC %collObj SPC %vec SPC %len );
@@ -203,7 +203,7 @@ function ShapeBaseData::onImpact(%this, %obj, %collObj, %vec, %len )
 
 function ShapeBaseData::damage(%this, %obj, %sourceObject, %position, %damage, %damageType)
 {
-   if (!isObject(%obj) || %obj.getDamageState() !$= "Enabled" || !%damage)
+   if (!isObject(%obj) || %obj.getDamageState() $= "Destroyed" || !%damage)
       return;
       
    %rootObj = %obj;
@@ -222,7 +222,7 @@ function ShapeBaseData::damage(%this, %obj, %sourceObject, %position, %damage, %
 
    if (isObject(%client))
    {
-      if (%rootObj.getDamageState() !$= "Enabled")
+      if (%obj.getDamageState() $= "Destroyed")
       {
          callGamemodeFunction("onDeath", %client, %sourceObject, %sourceClient, %damageType, "");
       }
@@ -233,7 +233,7 @@ function ShapeBaseData::onDamage(%this, %obj, %delta)
 {
    // This method is invoked by the ShapeBase code whenever the
    // object's damage level changes.
-   if (%delta > 0 && %obj.getDamageState() $= "Enabled")
+   if (%delta > 0 && %obj.getDamageState() !$= "Destroyed")
    {
       // Apply a damage flash
       %obj.setDamageFlash(1);