diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index aafa16de059..6120d357bf3 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -2797,7 +2797,7 @@ void Unit::_UpdateAutoRepeatSpell() // check "realtime" interrupts // don't cancel spells which are affected by a SPELL_AURA_CAST_WHILE_WALKING effect - if ((GetTypeId() == TYPEID_PLAYER && ToPlayer()->isMoving()) || IsNonMeleeSpellCast(false, false, true, autoRepeatSpellInfo->Id == 75)) && + if (((GetTypeId() == TYPEID_PLAYER && ToPlayer()->isMoving()) || IsNonMeleeSpellCast(false, false, true, autoRepeatSpellInfo->Id == 75)) && !HasAuraTypeWithAffectMask(SPELL_AURA_CAST_WHILE_WALKING, m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo)) { // cancel wand shoot diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 70a3215b33a..7bc68556cc7 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -210,7 +210,7 @@ class TC_GAME_API Group void SetGroupMarkerMask(uint32 mask) { m_markerMask = mask; } void AddGroupMarkerMask(uint32 mask) { m_markerMask |= mask; } void RemoveGroupMarkerMask(uint32 mask) { if (mask == 0x20) m_markerMask = 0x20; m_markerMask &= ~mask; } - bool HasMarker(uint32 mask) { return m_markerMask & mask; } + uint32 HasMarker(uint32 mask) { return m_markerMask & mask; } uint32 GetMarkerMask() { return m_markerMask; } DynamicObject* GetMarkerGuidBySpell(uint32 spell); diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 4083befbf5b..ac0fc53729c 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -470,7 +470,7 @@ void WorldSocket::SendPacketAndLogOpcode(WorldPacket& packet) SendPacket(packet); } -void WorldSocket::SendPacket(WorldPacket& packet) +void WorldSocket::SendPacket(WorldPacket const& packet) { if (!IsOpen()) return; diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index a19baf3d046..232b6119ff0 100644 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -65,7 +65,7 @@ public: void Start() override; bool Update() override; - void SendPacket(WorldPacket& packet); + void SendPacket(WorldPacket const& packet); protected: void OnClose() override;