Merge pull request #273 from NotAdam/actor_rewrite

proper event plays upon entering sastasha
2025-04-27 14:57:44 +00:00 · 2018-03-14 22:35:45 +01:00 · 2018-03-14 22:35:45 +01:00 · e75c04aa75
commit e75c04aa75
parent c501a62916 b1d1d885a7
277 changed files with 832 additions and 511 deletions
--- a/src/servers/Scripts/ScriptObject.h
+++ b/src/servers/Scripts/ScriptObject.h
@ -4,88 +4,7 @@
 #include <Forwards.h>
 #include <Script/NativeScriptApi.h>
-enum EventFlags
+#include <Event/EventDefs.h>
 {
   NONE = 0,
   NO_DEFAULT_CAMERA = 0x00000001,
   FADE_OUT = 0x00000002,
   INVIS_ENPC = 0x00000004,
   INVIS_EOBJ = 0x00000008,
   INVIS_BNPC = 0x00000010,
   INVIS_OTHER_PC = 0x00000020,
   INVIS_PARTY_PC = 0x00000040,
   INVIS_PARTY_BUDDY = 0x10000000,
   INVIS_GATHERING_POINT = 0x00000080,
   INVIS_AETHERYTE = 0x00000100,
   INVIS_TREASURE = 0x00000200,
   CONDITION_CUTSCENE = 0x00000400,
   HIDE_UI = 0x00000800,
   INVIS_ALL = 0xF80003FC,
   AUTO_LOC_CAMERA = 0x00001000,
   HIDE_HOTBAR = 0x00002000,
   INVINCIBLE = 0x00004000,
   SILENT_ENTER_TERRI_ENV = 0x00008000,
   SILENT_ENTER_TERRI_BGM = 0x00010000,
   SILENT_ENTER_TERRI_SE = 0x00020000,
   SILENT_ENTER_TERRI_ALL = 0x00038000,
   DISABLE_SKIP = 0x00080000,
   HIDE_FESTIVAL = 0x00200000,
   DISABLE_STEALTH = 0x00400000,
   ROLLBACK_HIDE_UI = 0x00800000,
   LOCK_HUD = 0x01000000,
   LOCK_HOTBAR = 0x02000000,
   DISABLE_CANCEL_EMOTE = 0x04000000,
   INVIS_AOE = 0x08000000,
   INVIS_ALLIANCE_PC = 0x20000000,
   INVIS_ALLIANCE_BUDDY = 0x40000000,
   INVIS_COMPANION = 0x80000000,
   SET_BASE = 0xF8400EFB,
   SET_INVIS_BASE = 0xF8400FFF,
   SET_EOBJ_BASE = 0xF8400EF3
 };
 enum EventTypes
 {
   EVENT_TALK = 1,
   EVENT_EMOTE = 2,
   EVENT_DISTANCE_BELOW = 3,
   EVENT_DISTANCE_OVER = 4,
   EVENT_BATTLE_REWARD = 5,
   EVENT_CRAFT = 6,
   EVENT_NEST = 7,
   EVENT_EVENT_ITEM = 8,
   EVENT_DROP = 9,
   EVENT_WITHIN_RANGE = 10,
   EVENT_OUTSIDE_RANGE = 11,
   EVENT_GAME_START = 12,
   EVENT_GAME_PROGRESS = 13,
   EVENT_ENTER_TERRITORY = 15,
   EVENT_GAME_COME_BACK = 17,
   EVENT_ACTION_RESULT = 18,
   EVENT_MATERIA_CRAFT = 19,
   EVENT_FISHING = 20,
   EVENT_UI = 21,
   EVENT_HOUSING = 22,
   EVENT_SAY = 23,
   EVENT_TABLE_GAME = 24
 };
 enum EventFinishState
 {
   UNLOCK = 1,
   KEEPLOCK = 0
 };
 enum DamageType
 {
   STD_DAMAGE = 0X03,
   STD_HEAL = 0X04,
   STD_MP_LOSS = 0X0A,
   STD_MP_GAIN = 0X0B,
   STD_TP_LOSS = 0X0C,
   STD_TP_GAIN = 0X0D
 };
 #endif //SAPPHIRE_SCRIPTOBJECT_H
--- a/src/servers/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
+++ b/src/servers/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
@ -31,7 +31,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
@ -21,7 +21,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
@ -27,7 +27,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
@ -27,7 +27,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
@ -19,7 +19,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
@ -21,7 +21,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
@ -21,7 +21,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
+++ b/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
+++ b/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
@ -140,7 +140,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
@ -57,7 +57,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
+++ b/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
@ -49,7 +49,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
+++ b/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
+++ b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
@ -40,7 +40,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
@ -46,7 +46,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
+++ b/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
+++ b/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
@ -87,7 +87,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
+++ b/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
@ -71,7 +71,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
@ -63,7 +63,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/CuttersCry.cpp
+++ b/src/servers/Scripts/instances/dungeons/CuttersCry.cpp
@ -57,7 +57,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/DomaCastle.cpp
+++ b/src/servers/Scripts/instances/dungeons/DomaCastle.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
+++ b/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
@ -117,7 +117,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/Halatali.cpp
+++ b/src/servers/Scripts/instances/dungeons/Halatali.cpp
@ -68,7 +68,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/HalataliHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/HalataliHard.cpp
@ -73,7 +73,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
+++ b/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
@ -61,7 +61,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
@ -87,7 +87,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/HellsLid.cpp
+++ b/src/servers/Scripts/instances/dungeons/HellsLid.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
+++ b/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
@ -85,7 +85,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
@ -48,7 +48,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
+++ b/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/Neverreap.cpp
+++ b/src/servers/Scripts/instances/dungeons/Neverreap.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/PharosSirius.cpp
+++ b/src/servers/Scripts/instances/dungeons/PharosSirius.cpp
@ -52,7 +52,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
@ -49,7 +49,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
+++ b/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/Scripts/instances/dungeons/Sastasha.cpp
@ -69,9 +69,9 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
   {
-      player.directorPlayScene( getId(), 1, NO_DEFAULT_CAMERA | HIDE_HOTBAR | CONDITION_CUTSCENE, 0, 0xA );
+
   }
 };
--- a/src/servers/Scripts/instances/dungeons/SastashaHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/SastashaHard.cpp
@ -57,7 +57,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
+++ b/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/Snowcloak.cpp
+++ b/src/servers/Scripts/instances/dungeons/Snowcloak.cpp
@ -63,7 +63,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/SohmAl.cpp
+++ b/src/servers/Scripts/instances/dungeons/SohmAl.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/SohrKhai.cpp
+++ b/src/servers/Scripts/instances/dungeons/SohrKhai.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheAery.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAery.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheAntitower.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAntitower.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
@ -39,7 +39,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
@ -52,7 +52,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
@ -72,7 +72,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
@ -63,7 +63,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
+++ b/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
@ -133,7 +133,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
@ -54,7 +54,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
@ -47,7 +47,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
@ -80,7 +80,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
@ -71,7 +71,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
@ -48,7 +48,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
@ -95,7 +95,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
@ -70,7 +70,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheVault.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheVault.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
@ -71,7 +71,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
@ -52,7 +52,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/dungeons/Xelphatol.cpp
+++ b/src/servers/Scripts/instances/dungeons/Xelphatol.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/events/TheHauntedManor.cpp
+++ b/src/servers/Scripts/instances/events/TheHauntedManor.cpp
@ -34,7 +34,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
+++ b/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
@ -62,7 +62,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
+++ b/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
@ -20,7 +20,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
+++ b/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
+++ b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
+++ b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
@ -21,7 +21,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
+++ b/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
@ -18,7 +18,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
+++ b/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
+++ b/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
@ -34,7 +34,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
+++ b/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
+++ b/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
+++ b/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
@ -34,7 +34,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
+++ b/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/StingingBack.cpp
+++ b/src/servers/Scripts/instances/guildhests/StingingBack.cpp
@ -20,7 +20,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
+++ b/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
@ -18,7 +18,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/guildhests/WardUp.cpp
+++ b/src/servers/Scripts/instances/guildhests/WardUp.cpp
@ -17,7 +17,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
@ -27,7 +27,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
@ -27,7 +27,8 @@ public:
   }
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
                             uint16_t param2 ) override
   {
   }
--- a/Show more
+++ b/Show more