Merge pull request #12046 from phoenixfight/fishmaster
Core/Fishing: Repair fishing spell result fish escape
This commit is contained in:
commit
9f4bab55ed
6 files changed
+61
-10
No files matched your search
@@ -696,12 +696,39 @@ void GameObject::getFishLoot(Loot* fishloot, Player* loot_owner)
|
||||
fishloot->clear();
|
||||
|
||||
uint32 zone, subzone;
|
||||
uint32 defaultzone = 1;
|
||||
GetZoneAndAreaId(zone, subzone);
|
||||
|
||||
// if subzone loot exist use it
|
||||
if (!fishloot->FillLoot(subzone, LootTemplates_Fishing, loot_owner, true, true))
|
||||
// else use zone loot (must exist in like case)
|
||||
fishloot->FillLoot(zone, LootTemplates_Fishing, loot_owner, true);
|
||||
fishloot->FillLoot(subzone, LootTemplates_Fishing, loot_owner, true, true);
|
||||
if (fishloot->empty()) //use this becase if zone or subzone has set LOOT_MODE_JUNK_FISH,Even if no normal drop, fishloot->FillLoot return true. it wrong.
|
||||
{
|
||||
//subzone no result,use zone loot
|
||||
fishloot->FillLoot(zone, LootTemplates_Fishing, loot_owner, true, true);
|
||||
//use zone 1 as default, somewhere fishing got nothing,becase subzone and zone not set, like Off the coast of Storm Peaks.
|
||||
if (fishloot->empty())
|
||||
fishloot->FillLoot(defaultzone, LootTemplates_Fishing, loot_owner, true, true);
|
||||
}
|
||||
}
|
||||
|
||||
void GameObject::getFishLootJunk(Loot* fishloot, Player* loot_owner)
|
||||
{
|
||||
fishloot->clear();
|
||||
|
||||
uint32 zone, subzone;
|
||||
uint32 defaultzone = 1;
|
||||
GetZoneAndAreaId(zone, subzone);
|
||||
|
||||
// if subzone loot exist use it
|
||||
fishloot->FillLoot(subzone, LootTemplates_Fishing, loot_owner, true, true, LOOT_MODE_JUNK_FISH);
|
||||
if (fishloot->empty()) //use this becase if zone or subzone has normal mask drop, then fishloot->FillLoot return true.
|
||||
{
|
||||
//use zone loot
|
||||
fishloot->FillLoot(zone, LootTemplates_Fishing, loot_owner, true, true, LOOT_MODE_JUNK_FISH);
|
||||
if (fishloot->empty())
|
||||
//use zone 1 as default
|
||||
fishloot->FillLoot(defaultzone, LootTemplates_Fishing, loot_owner, true, true, LOOT_MODE_JUNK_FISH);
|
||||
}
|
||||
}
|
||||
|
||||
void GameObject::SaveToDB()
|
||||
@@ -1416,10 +1443,8 @@ void GameObject::Use(Unit* user)
|
||||
else
|
||||
player->SendLoot(GetGUID(), LOOT_FISHING);
|
||||
}
|
||||
/// @todo else: junk
|
||||
else
|
||||
m_respawnTime = time(NULL);
|
||||
|
||||
else // else: junk
|
||||
player->SendLoot(GetGUID(), LOOT_FISHING_JUNK);
|
||||
break;
|
||||
}
|
||||
case GO_JUST_DEACTIVATED: // nothing to do, will be deleted at next update
|
||||
|
||||
Reference in new issue
Block a user