Remove DeleteBonesFromWorld method from corpse and fix build for TC

2015-11-09 17:56:17 +02:00
parent e41fed0c0d
commit c94ef51cbe
5 changed files with 22 additions and 17 deletions
--- a/PlayerMethods.h
+++ b/PlayerMethods.h
@@ -817,7 +817,10 @@ namespace LuaPlayer
        uint32 spellId = Eluna::CHECKVAL<uint32>(L, 2);

 #ifdef TRINITY
-        Eluna::Push(L, player->GetSpellHistory()->GetRemainingCooldown(spellId));
+        if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId))
+            Eluna::Push(L, player->GetSpellHistory()->GetRemainingCooldown(spellInfo));
+        else
+            Eluna::Push(L, 0);
 #else
        Eluna::Push(L, uint32(player->GetSpellCooldownDelay(spellId)));
 #endif