diff options
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index cabb755958a..2d55920d0f1 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9555,19 +9555,8 @@ void Unit::Unmount() // only resummon old pet if the player is already added to a map // this prevents adding a pet to a not created map which would otherwise cause a crash // (it could probably happen when logging in after a previous crash) -<<<<<<< HEAD:src/game/Unit.cpp - if(GetTypeId() == TYPEID_PLAYER && IsInWorld() && ((Player*)this)->GetTemporaryUnsummonedPetNumber() && isAlive()) - { - Pet* NewPet = new Pet((Player*)this); - if(!NewPet->LoadPetFromDB((Player*)this, 0, ((Player*)this)->GetTemporaryUnsummonedPetNumber(), true)) - delete NewPet; - - ((Player*)this)->SetTemporaryUnsummonedPetNumber(0); - } -======= if(GetTypeId() == TYPEID_PLAYER) ((Player*)this)->ResummonPetTemporaryUnSummonedIfAny(); ->>>>>>> 661760f287d94dbbe8f5224b19ba4181c7d62910:src/game/Unit.cpp } void Unit::SetInCombatWith(Unit* enemy) |