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

1 files changed, 2 insertions, 4 deletions

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);
 }