From 1bd3f9604cae7ba47368b85a0fcfe024768c8944 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Tue, 6 Oct 2009 00:52:09 +0200 Subject: * Allow players to get fishing skillups from fishing in any area, no more "your fish got away" message. However still need core support to manipulate fishing loot based on fishing skill. --HG-- branch : trunk --- src/game/GameObject.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index d22acfe57b3..75b51f8bb41 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -1119,15 +1119,15 @@ void GameObject::Use(Unit* user) DEBUG_LOG("Fishing check (skill: %i zone min skill: %i chance %i roll: %i",skill,zone_skill,chance,roll); + player->UpdateFishingSkill(); + // 3.1 changes, you can now fish anywhere and get fishing skillups + // but you will likely cause junk in areas that require a high fishing skill (not yet implemented) if(skill >= zone_skill && chance >= roll) { // prevent removing GO at spell cancel player->RemoveGameObject(this,false); SetOwnerGUID(player->GetGUID()); - //fish catched - player->UpdateFishingSkill(); - //TODO: find reasonable value for fishing hole search GameObject* ok = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE); if (ok) @@ -1139,14 +1139,6 @@ void GameObject::Use(Unit* user) else player->SendLoot(GetGUID(),LOOT_FISHING); } - else - { - // fish escaped, can be deleted now - SetLootState(GO_JUST_DEACTIVATED); - - WorldPacket data(SMSG_FISH_ESCAPED, 0); - player->GetSession()->SendPacket(&data); - } break; } case GO_JUST_DEACTIVATED: // nothing to do, will be deleted at next update -- cgit v1.2.3