Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.h src/server/game/Handlers/ChatHandler.cpp src/server/game/Spells/SpellEffects.cpp src/server/scripts/Commands/cs_wp.cpp src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
This commit is contained in:
commit
ca3961f987
38 files changed
+539
-735
No files matched your search
@@ -214,7 +214,7 @@ public:
|
||||
target->LoadPath(pathid);
|
||||
target->SetDefaultMovementType(WAYPOINT_MOTION_TYPE);
|
||||
target->GetMotionMaster()->Initialize();
|
||||
target->MonsterSay("Path loaded.", LANG_UNIVERSAL, NULL);
|
||||
target->Say("Path loaded.", LANG_UNIVERSAL);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -275,7 +275,7 @@ public:
|
||||
target->SetDefaultMovementType(IDLE_MOTION_TYPE);
|
||||
target->GetMotionMaster()->MoveTargetedHome();
|
||||
target->GetMotionMaster()->Initialize();
|
||||
target->MonsterSay("Path unloaded.", LANG_UNIVERSAL, NULL);
|
||||
target->Say("Path unloaded.", LANG_UNIVERSAL);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user