Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Creature: don't allow turning if spell would cancel due to turning to face target

Browse Source 
Port TrinityCore Commit: https://github.com/TrinityCore/TrinityCore/commit/6135ee1ad7052992093ad392347f4ef2c2ef4cf6
This commit is contained in:
hondacrx
2019-08-14 11:45:38 -04:00
parent 44cabeb8e1
commit e35ba6d97f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Creature.cs
+5 -3
View File
@@ -2702,8 +2702,10 @@ namespace Game.Entities
if (_focusSpell != null) if (_focusSpell != null)
return; return;
SpellInfo spellInfo = focusSpell.GetSpellInfo();
// don't use spell focus for vehicle spells // don't use spell focus for vehicle spells
if (focusSpell.GetSpellInfo().HasAura(Difficulty.None, AuraType.ControlVehicle)) if (spellInfo.HasAura(Difficulty.None, AuraType.ControlVehicle))
return; return;
if ((!target || target == this) && focusSpell.GetCastTime() == 0) // instant cast, untargeted (or self-targeted) spell doesn't need any facing updates if ((!target || target == this) && focusSpell.GetCastTime() == 0) // instant cast, untargeted (or self-targeted) spell doesn't need any facing updates
@@ -2726,8 +2728,8 @@ namespace Game.Entities
// here we determine if the (relatively expensive) forced update is worth it, or whether we can afford to wait until the scheduled update tick // here we determine if the (relatively expensive) forced update is worth it, or whether we can afford to wait until the scheduled update tick
// only require instant update for spells that actually have a visual // only require instant update for spells that actually have a visual
if (focusSpell.GetSpellInfo().GetSpellVisual() != 0 && (focusSpell.GetCastTime() == 0 || // if the spell is instant cast if (spellInfo.GetSpellVisual() != 0 && (focusSpell.GetCastTime() == 0 || // if the spell is instant cast
focusSpell.GetSpellInfo().HasAttribute(SpellAttr5.DontTurnDuringCast))) // client gets confused if we attempt to turn at the regularly scheduled update packet spellInfo.HasAttribute(SpellAttr5.DontTurnDuringCast))) // client gets confused if we attempt to turn at the regularly scheduled update packet
{ {
List<Player> playersNearby = GetPlayerListInGrid(GetVisibilityRange()); List<Player> playersNearby = GetPlayerListInGrid(GetVisibilityRange());
foreach (var player in playersNearby) foreach (var player in playersNearby)