diff options
| author | Carbenium <keresztesschmidt@gmail.com> | 2015-04-02 17:07:23 +0200 |
|---|---|---|
| committer | Carbenium <keresztesschmidt@gmail.com> | 2015-04-02 17:07:23 +0200 |
| commit | 16e749cdd057ab0194cd0b121f7333c04139f1bb (patch) | |
| tree | 506a4a047aa416b3386947528ffe281435475423 /src | |
| parent | 5c1600b9bae24e323a6f91c52d75c68226e18290 (diff) | |
Core/Unit: Fix crash introduced by 930a6af70a85f0d14b9befd74f33e0ad24f74875
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index da615a847de..910b1c747da 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10100,11 +10100,9 @@ int32 Unit::ModifyHealth(int32 dVal) packet.Guid = GetGUID(); packet.Health = GetHealth(); - if (GetTypeId() == TYPEID_PLAYER) - ToPlayer()->GetSession()->SendPacket(packet.Write()); - else - if (Player* player = GetOwner()->ToPlayer()) - player->GetSession()->SendPacket(packet.Write()); + if (Player* player = GetCharmerOrOwnerPlayerOrPlayerItself()) + player->GetSession()->SendPacket(packet.Write()); + } return gain; |