All pastes #945049 Raw Edit

Something

public text v1 · immutable
·published 2008-03-16 17:33 UTC
rendered paste body
Index: scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
===================================================================
--- scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp	(revision 290)
+++ scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp	(working copy)
@@ -446,13 +446,13 @@
 bool GOHello_go_Manticron_Cube(Player *player, GameObject* _GO)
 {
     //Can't use this here
-    if (!_GO->GetMap()->GetInstanceData())
+    if (!_GO->GetInstanceData())
     {
         _GO->TextEmote("Mantricon Cube: NO INSTANCE", 0);
         return true;
     }
 
-    ScriptedInstance* pInst = (ScriptedInstance*)_GO->GetMap()->GetInstanceData();
+    ScriptedInstance* pInst = (ScriptedInstance*)_GO->GetInstanceData();
 
     Unit* pUnit = Unit::GetUnit(*_GO, pInst->GetData64(DATA_MAGTHERIDON));
 
Index: scripts/zone/black_temple/boss_illidan.cpp
===================================================================
--- scripts/zone/black_temple/boss_illidan.cpp	(revision 290)
+++ scripts/zone/black_temple/boss_illidan.cpp	(working copy)
@@ -1524,7 +1524,7 @@
 {
     boss_maievAI(Creature *c) : ScriptedAI(c)
     {
-        pInstance = ((ScriptedInstance*)c->GetMap()->GetInstanceData());
+        pInstance = ((ScriptedInstance*)c->GetInstanceData());
         Reset(); 
     };
 
Index: ScriptMgr.cpp
===================================================================
--- ScriptMgr.cpp	(revision 290)
+++ ScriptMgr.cpp	(working copy)
@@ -1638,7 +1638,8 @@
 {
     Script *tmpscript = NULL;
 
-    tmpscript = GetScriptByName(map->GetScript());
+    if(map->IsDungeon())
+        tmpscript = GetScriptByName(((InstanceMap*)map)->GetScript());
     if(!tmpscript || !tmpscript->GetInstanceData) return false;
 
     return tmpscript->GetInstanceData(map);