diff --git a/data/sql/updates/pending_db_world/rev_1731165151168533600.sql b/data/sql/updates/pending_db_world/rev_1731165151168533600.sql new file mode 100644 index 000000000..30174cb66 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1731165151168533600.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `creature` WHERE `guid` = 320 AND `id1` = 24358; +INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES +(320, 24358, 0, 0, 568, 0, 0, 1, 1, 0, 121.36404, 1674.9835, 42.10491, 1.553343057632446289, 608400, 0, 0, 4890, 0, 2, 1, 0, 0, 'npc_harrison_jones', 50375, 2, NULL); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index ec3cd93ea..250f7b576 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -93,7 +93,6 @@ public: ObjectGuid AshlisBagGUID; ObjectGuid KrazsPackageGUID; ObjectGuid StrangeGongGUID; - ObjectGuid HarrisonJonesGUID; ObjectGuid HexLordGateGUID; ObjectGuid ZulJinGateGUID; @@ -129,25 +128,6 @@ public: m_auiEncounter[DATA_GONGEVENT] = NOT_STARTED; } - void OnPlayerEnter(Player* /*player*/) override - { - if (!HarrisonJonesGUID) - instance->SummonCreature(NPC_HARRISON_JONES, HarrisonJonesLoc); - } - - void OnCreatureCreate(Creature* creature) override - { - switch (creature->GetEntry()) - { - case NPC_HARRISON_JONES: - HarrisonJonesGUID = creature->GetGUID(); - break; - default: - break; - } - InstanceScript::OnCreatureCreate(creature); - } - void OnGameObjectCreate(GameObject* go) override { switch (go->GetEntry())