From bf2c3fd8cf32578324162a8bef2ac6e48e7e0009 Mon Sep 17 00:00:00 2001 From: win32 Date: Wed, 16 Dec 2009 18:58:36 +0200 Subject: MaNGOS merge: Mail System. * Store loot in mail_loot_template indexed by mail template ids. * Implement proper creating mail text copy item from mail template based mail. * Move send functions to new MailDraft class from WorldSession. * Implement mails sending at player levelup. * Autor VladimirMangos, converted by me. --HG-- branch : trunk --- src/game/GameObject.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/game/GameObject.cpp') diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 42c2fd04cc4..02a3ede06aa 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -527,10 +527,8 @@ void GameObject::getFishLoot(Loot *fishloot, Player* loot_owner) GetZoneAndAreaId(zone,subzone); // if subzone loot exist use it - if(LootTemplates_Fishing.HaveLootFor(subzone)) - fishloot->FillLoot(subzone, LootTemplates_Fishing, loot_owner,true); - // else use zone loot - else + 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); } -- cgit v1.2.3