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
@@ -1224,7 +1224,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
creature->MonsterSay(args, LANG_UNIVERSAL, NULL);
|
||||
creature->Say(args, LANG_UNIVERSAL);
|
||||
|
||||
// make some emotes
|
||||
char lastchar = args[strlen(args) - 1];
|
||||
@@ -1253,7 +1253,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
creature->MonsterTextEmote(args, 0);
|
||||
creature->TextEmote(args);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -1330,7 +1330,7 @@ public:
|
||||
if (handler->HasLowerSecurity(receiver, 0))
|
||||
return false;
|
||||
|
||||
creature->MonsterWhisper(text, receiver);
|
||||
creature->Whisper(text, LANG_UNIVERSAL, receiver);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1351,7 +1351,7 @@ public:
|
||||
return false;
|
||||
}
|
||||
|
||||
creature->MonsterYell(args, LANG_UNIVERSAL, NULL);
|
||||
creature->Yell(args, LANG_UNIVERSAL);
|
||||
|
||||
// make an emote
|
||||
creature->HandleEmoteCommand(EMOTE_ONESHOT_SHOUT);
|
||||
|
||||
Reference in new issue
Block a user