Merge remote-tracking branch 'origin/3.3.5' into 4.3.4
Conflicts: sql/base/auth_database.sql src/server/game/Instances/InstanceScript.h src/server/scripts/Northrend/isle_of_conquest.cpp src/server/shared/Database/Implementation/LoginDatabase.cpp src/server/shared/Database/Implementation/LoginDatabase.h
This commit is contained in:
commit
5bf55eacfd
39 files changed
+1593
-419
No files matched your search
@@ -203,6 +203,8 @@ void Vehicle::ApplyAllImmunities()
|
||||
case 160: // Strand of the Ancients
|
||||
case 244: // Wintergrasp
|
||||
case 510: // Isle of Conquest
|
||||
case 452: // Isle of Conquest
|
||||
case 543: // Isle of Conquest
|
||||
_me->SetControlled(true, UNIT_STATE_ROOT);
|
||||
// why we need to apply this? we can simple add immunities to slow mechanic in DB
|
||||
_me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_DECREASE_SPEED, true);
|
||||
|
||||
Reference in new issue
Block a user