nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-22 05:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2023-03-22 09:35:01 -06:00
committed by GitHub
parent e9143a2c0b 2f52fc9a85
commit 71e8baf929
18 changed files with 378 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -21416,15 +21416,20 @@ bool Unit::CanRestoreMana(SpellInfo const* spellInfo) const
// Aura of Despair exceptions
switch (spellInfo->Id)
{
case 16666: // Demonic Rune
case 27869: // Dark Rune
case 30824: // Shamanistic Rage
case 31786: // Spiritual Attunement
case 31930: // Judgements of the Wise
case 34075: // Aspect of the Viper
case 34720: // Thrill of the hunt
case 47755: // Rapture
case 54425: // Improved Felhunter
case 57319: // Blessing of Sanctuary
case 63337: // Saronite Vapors (regenerate mana)
case 63375: // Improved stormstrike
case 64372: // Lifebloom
case 68285: // Improved Leader of the Pack
return true;
case 54428: // Divine Plea - only with talent Guarded by the Light
return HasSpell(53583);

6
src/server/game/Entities/Vehicle/Vehicle.cpp
View File

@@ -491,11 +491,11 @@ void Vehicle::RemovePassenger(Unit* unit)
if (_me->IsFlying() && !_me->GetInstanceId() && unit->GetTypeId() == TYPEID_PLAYER && !(unit->ToPlayer()->GetDelayedOperations() & DELAYED_VEHICLE_TELEPORT) && _me->GetEntry() != 30275 /*NPC_WILD_WYRM*/)
_me->CastSpell(unit, VEHICLE_SPELL_PARACHUTE, true);
if (_me->GetTypeId() == TYPEID_UNIT)
sScriptMgr->OnRemovePassenger(this, unit);
if (_me->GetTypeId() == TYPEID_UNIT && _me->ToCreature()->IsAIEnabled)
_me->ToCreature()->AI()->PassengerBoarded(unit, seat->first, false);
if (_me && _me->GetTypeId() == TYPEID_UNIT)
sScriptMgr->OnRemovePassenger(this, unit);
}
void Vehicle::RelocatePassengers()

10
src/server/game/Handlers/MiscHandler.cpp
View File

@@ -538,16 +538,6 @@ void WorldSession::HandleSetSelectionOpcode(WorldPacket& recv_data)
ObjectGuid guid;
recv_data >> guid;
if (!guid)
{
// Clear any active gossip related to current selection if not present at player's client
GossipMenu& gossipMenu = _player->PlayerTalkClass->GetGossipMenu();
if (gossipMenu.GetSenderGUID() == _player->GetTarget())
{
_player->PlayerTalkClass->SendCloseGossip();
}
}
_player->SetSelection(guid);
// Change target of current autoshoot spell