Merge remote-tracking branch 'origin/master' into mmaps

1 files changed, 24 insertions, 3 deletions

diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index e24547f1a31..7628906f0fc 100755
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -279,6 +279,18 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
                 condMeets = player->HasTitle(ConditionValue1);
             break;
         }
+        case CONDITION_MAP_DIFFICULTY:
+        {
+            if (Unit* unit = object->ToUnit())
+            {
+                if (unit->GetMap()->IsRaid())
+                    if (unit->GetMap()->Is25ManRaid() != ((ConditionValue1 & RAID_DIFFICULTY_MASK_25MAN) != 0))
+                        return false;
+
+                condMeets = unit->GetMap()->GetSpawnMode() >= ConditionValue1;
+            }
+            break;
+        }
         default:
             condMeets = false;
             break;
@@ -430,6 +442,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition()
         case CONDITION_TITLE:
             mask |= GRID_MAP_TYPE_MASK_PLAYER;
             break;
+        case CONDITION_MAP_DIFFICULTY:
+            mask |= GRID_MAP_TYPE_MASK_ALL;
+            break;
         default:
             ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!");
             break;
@@ -1842,9 +1857,15 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
             }
             break;
         }
-        case CONDITION_UNUSED_19:
-            sLog->outError(LOG_FILTER_SQL, "Found ConditionTypeOrReference = CONDITION_UNUSED_19 in `conditions` table - ignoring");
-            return false;
+        case CONDITION_MAP_DIFFICULTY:
+        {
+            if (cond->ConditionValue1 >= MAX_DIFFICULTY)
+            {
+                sLog->outError(LOG_FILTER_SQL, "Map Difficulty condition has non existing map difficulty in value1 (%u), skipped", cond->ConditionValue1);
+                return false;
+            }
+            break;
+        }
         case CONDITION_UNUSED_20:
             sLog->outError(LOG_FILTER_SQL, "Found ConditionTypeOrReference = CONDITION_UNUSED_20 in `conditions` table - ignoring");
             return false;