diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2014-07-14 18:31:16 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2014-07-14 18:31:16 +0200 |
| commit | 1088c27562bbf60897129713b610e122fd018545 (patch) | |
| tree | 8ecd487fbdaac563a5a511c0a14e90a884a19216 /src/server/game/Entities | |
| parent | 8e88a42420da142dad7b4cb9c0e7191a261c0952 (diff) | |
Core/Battleground: moved some arena related code into a generic arena class
* fixed typo in random bg selection, that causes no bg is created if only one bg is enabled
* fixed swapped worldstates in Ring of Valor
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Pet/Pet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index cc199969174..d41878bed3b 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -525,7 +525,7 @@ void Pet::setDeathState(DeathState s) // overwrite virtual //lose happiness when died and not in BG/Arena MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId()); - if (!mapEntry || (mapEntry->map_type != MAP_ARENA && mapEntry->map_type != MAP_BATTLEGROUND)) + if (!GetMap()->IsBattlegroundOrArena()) ModifyPower(POWER_HAPPINESS, -HAPPINESS_LEVEL_SIZE); //SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); |