diff --git a/src/common/Common.h b/src/common/Common.h index da94d9b0..6cc4c791 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -1872,8 +1872,8 @@ namespace Sapphire::Common { SingleTarget = 1, CircularAOE = 2, - Type3 = 3, // another single target? no idea how to call it - RectangularAOE = 4, + RectangularAOE = 3, + ConeAOE = 4, CircularAoEPlaced = 7 }; diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h index 66a680f9..0e00a6a1 100644 --- a/src/world/Action/Action.h +++ b/src/world/Action/Action.h @@ -193,6 +193,7 @@ namespace Sapphire::World::Action uint8_t m_cooldownGroup{}; int8_t m_range{}; uint8_t m_effectRange{}; + uint8_t m_effectWidth{}; uint8_t m_xAxisModifier{}; Common::ActionAspect m_aspect; Common::CastType m_castType; diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp index 27605f1a..14c31745 100644 --- a/src/world/Manager/ActionMgr.cpp +++ b/src/world/Manager/ActionMgr.cpp @@ -71,13 +71,6 @@ void ActionMgr::handleTargetedPlayerAction( Entity::Player& player, uint32_t act if( !action->init() ) return; - // cancel any aoe actions casted with this packet - if( actionData->data().EffectRange ) - { - action->interrupt(); - return; - } - bootstrapAction( player, action, actionData ); }