From 9f85a104d770a2df23a013c23f2b33e7f19b7695 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 9 Oct 2022 12:47:04 +0200 Subject: [PATCH] Core/Spells: fixed a typo that was causing all charmed units to now have any spells despite being defined as such --- src/server/game/Entities/Player/Player.cpp | 2 +- src/server/game/Entities/Vehicle/Vehicle.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index f462591d61..77ef654da9 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -21341,7 +21341,7 @@ void Player::VehicleSpellInitialize() { uint32 spellId = vehicle->m_spells[i]; SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); - if (!spellInfo || !spellInfo->HasAttribute(SPELL_ATTR5_NOT_AVAILABLE_WHILE_CHARMED)) + if (!spellInfo || spellInfo->HasAttribute(SPELL_ATTR5_NOT_AVAILABLE_WHILE_CHARMED)) { data << uint16(0) << uint8(0) << uint8(i+8); continue; diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 5d292badf7..3ac5cf1717 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -922,6 +922,7 @@ bool VehicleJoinEvent::Execute(uint64, uint32) if (Target->GetBase()->GetTypeId() == TYPEID_UNIT && Passenger->GetTypeId() == TYPEID_PLAYER && veSeat->HasFlag(VEHICLE_SEAT_FLAG_CAN_CONTROL)) + { // handles SMSG_CLIENT_CONTROL if (!Target->GetBase()->SetCharmedBy(Passenger, CHARM_TYPE_VEHICLE, aurApp)) { @@ -929,6 +930,7 @@ bool VehicleJoinEvent::Execute(uint64, uint32) Abort(0); return true; } + } Passenger->SendClearTarget(); // SMSG_BREAK_TARGET Passenger->SetControlled(true, UNIT_STATE_ROOT); // SMSG_FORCE_ROOT - In some cases we send SMSG_SPLINE_MOVE_ROOT here (for creatures)