diff options
| -rw-r--r-- | contrib/merge_updates_windows.bat | 1 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/contrib/merge_updates_windows.bat b/contrib/merge_updates_windows.bat index 96fafb817ba..c43d4adf907 100644 --- a/contrib/merge_updates_windows.bat +++ b/contrib/merge_updates_windows.bat @@ -1,2 +1 @@ copy /a ..\sql\updates\world\*.sql /b world_updates.sql -copy /a ..\sql\updates\auth\*.sql /b auth_updates.sql
\ No newline at end of file diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 948dc9b7cb3..03051451193 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -227,6 +227,8 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) case TYPEID_GAMEOBJECT: condMeets &= object->ToGameObject()->GetDBTableGUIDLow() == ConditionValue3; break; + default: + break; } } } |