diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-12-23 13:51:17 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-12-23 13:51:17 -0500 |
| commit | 64775fba3ef653e843c3a525bf58804267aee591 (patch) | |
| tree | 242ed785e3291133020dd405cc7319f48be1349a | |
| parent | 7a2c81bfd01663f636871ebbb2c2e71cf241af73 (diff) | |
Fixed a merge fail
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 471cbc6d114..9615513a181 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -20331,6 +20331,11 @@ void Player::WhisperAddon(const std::string& text, const std::string& prefix, Pl void Player::Whisper(const std::string& text, uint32 language, uint64 receiver) { + bool isAddonMessage = language == LANG_ADDON; + + if (!isAddonMessage) // if not addon data + language = LANG_UNIVERSAL; // whispers should always be readable + Player* rPlayer = ObjectAccessor::FindPlayer(receiver); std::string _text(text); |