diff options
| -rw-r--r-- | src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp | 2 | ||||
| -rw-r--r-- | src/game/Creature.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp index f7c929be704..ca9c9c6bf44 100644 --- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp +++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp @@ -162,6 +162,7 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI { m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); GameObject* Cage = FindGameObject(GO_CAGE); + if(Cage) Cage->SetGoState(0); DoSay(SAY_START, LANG_UNIVERSAL, player); break; @@ -198,6 +199,7 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI m_creature->SetOrientation(5.858011); DoSay(SAY_END2, LANG_UNIVERSAL, player); Unit* CaptainHelios = FindCreature(NPC_CAPTAIN_HELIOS, 50); + if(CaptainHelios) ((Creature*)CaptainHelios)->Say(CAPTAIN_ANSWER, LANG_UNIVERSAL, PlayerGUID); break; } diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index c57b8a27fb9..629b5ec6d43 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1519,7 +1519,6 @@ void Creature::DeleteFromDB() WorldDatabase.BeginTransaction(); WorldDatabase.PExecuteLog("DELETE FROM creature WHERE guid = '%u'", m_DBTableGuid); WorldDatabase.PExecuteLog("DELETE FROM creature_addon WHERE guid = '%u'", m_DBTableGuid); - WorldDatabase.PExecuteLog("DELETE FROM creature_movement WHERE id = '%u'", m_DBTableGuid); WorldDatabase.PExecuteLog("DELETE FROM game_event_creature WHERE guid = '%u'", m_DBTableGuid); WorldDatabase.PExecuteLog("DELETE FROM game_event_model_equip WHERE guid = '%u'", m_DBTableGuid); WorldDatabase.CommitTransaction(); |