Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Handlers/ItemHandler.cpp src/server/scripts/Spells/spell_dk.cpp
This commit is contained in:
@@ -1405,6 +1405,7 @@ void GameObject::Use(Unit* user)
|
||||
// prevent removing GO at spell cancel
|
||||
RemoveFromOwner();
|
||||
SetOwnerGUID(player->GetGUID());
|
||||
SetSpellId(0); // prevent removing unintended auras at Unit::RemoveGameObject
|
||||
|
||||
/// @todo find reasonable value for fishing hole search
|
||||
GameObject* ok = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE);
|
||||
|
||||
Reference in New Issue
Block a user