1 files changed, 15 insertions, 3 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 67c81b35065..d89b885af42 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -317,6 +317,12 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
                 condMeets = unit->HasUnitState(ConditionValue1);
             break;
         }
+        case CONDITION_CREATURE_TYPE:
+        {
+            if (Creature* creature = object->ToCreature())
+                condMeets = creature->GetCreatureTemplate()->type == ConditionValue1;
+            break;
+        }
         default:
             condMeets = false;
             break;
@@ -1988,9 +1994,15 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
             }
             break;
         }
-        case CONDITION_UNUSED_24:
-            TC_LOG_ERROR(LOG_FILTER_SQL, "Found ConditionTypeOrReference = CONDITION_UNUSED_24 in `conditions` table - ignoring");
-            return false;
+        case CONDITION_CREATURE_TYPE:
+        {
+            if (!cond->ConditionValue1 || cond->ConditionValue1 > CREATURE_TYPE_GAS_CLOUD)
+            {
+                TC_LOG_ERROR(LOG_FILTER_SQL, "CreatureType condition has non existing CreatureType in value1 (%u), skipped", cond->ConditionValue1);
+                return false;
+            }
+            break;
+        }
         default:
             break;
     }