diff --git a/src/common/Common.h b/src/common/Common.h index 5c9f1d57..3c4c6b6f 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -1054,13 +1054,13 @@ namespace Sapphire::Common HideUILockChar = 16, // as the name suggests, hides the ui and logs the char... InCombat = 17, // in Combat, locks gearchange/return/teleport Casting = 18, - InNpcEvent = 23, // when talking to an npc, locks ui giving "occupied" message + InNpcEvent = 20, // when talking to an npc, locks ui giving "occupied" message // InNpcEvent1 = 10, // Sent together with InNpcEvent, when waiting for input? just a guess... BoundByDuty = 26, BetweenAreas = 37, - WatchingCutscene = 51, // this is actually just a dummy, this id is different + WatchingCutscene = 49, // this is actually just a dummy, this id is different }; diff --git a/src/world/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp index 02e568db..1228d43b 100644 --- a/src/world/Network/Handlers/EventHandlers.cpp +++ b/src/world/Network/Handlers/EventHandlers.cpp @@ -139,7 +139,7 @@ void Sapphire::Network::GameConnection::eventHandlerOutsideRange( const Packets: std::string objName = eventMgr.getEventName( eventId ); World::Manager::PlayerMgr::sendDebug( player, "Calling: {0}.{1} - {2} p1: {3}", objName, eventName, eventId, param1 ); - eventMgr.eventStart( player, player.getId(), eventId, Event::EventHandler::WithinRange, 1, param1 ); + eventMgr.eventStart( player, player.getId(), eventId, Event::EventHandler::OutsideRange, 1, param1 ); scriptMgr.onOutsideRange( player, eventId, param1, pos.x, pos.y, pos.z );