diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index db1900aa1..b0a3a60a9 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -1137,8 +1137,7 @@ void GameObject::Use(Unit* user) GameObject* ok = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE); if (ok) { - player->SendLoot(ok->GetGUID(),LOOT_FISHINGHOLE); - player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_FISH_IN_GAMEOBJECT, ok->GetGOInfo()->id); + ok->Use(player); SetLootState(GO_JUST_DEACTIVATED); } else @@ -1335,6 +1334,17 @@ void GameObject::Use(Unit* user) } break; } + case GAMEOBJECT_TYPE_FISHINGHOLE: // 25 + { + if (user->GetTypeId() != TYPEID_PLAYER) + return; + + Player* player = (Player*)user; + + player->SendLoot(GetGUID(), LOOT_FISHINGHOLE); + player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_FISH_IN_GAMEOBJECT, GetGOInfo()->id); + return; + } case GAMEOBJECT_TYPE_FLAGDROP: // 26 { if (user->GetTypeId() != TYPEID_PLAYER) diff --git a/src/game/GameObject.h b/src/game/GameObject.h index 095f685e8..b2c5abf0f 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -281,7 +281,7 @@ struct GameObjectInfo uint32 openTextID; //6 uint32 losOK; //7 } flagstand; - //25 GAMEOBJECT_TYPE_FISHINGHOLE // not implemented yet + //25 GAMEOBJECT_TYPE_FISHINGHOLE struct { uint32 radius; //0 how close bobber must land for sending loot diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 437ad150a..9e6024daa 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10325" + #define REVISION_NR "10326" #endif // __REVISION_NR_H__