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

Core/Auras: Don't save liquid auras

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/2bea816bbec6ba9d50f7bd6725806e81c6cafaae)
This commit is contained in:
hondacrx
2021-09-24 10:16:38 -04:00
parent 3356b921ab
commit dbfef1ee87
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Spells/SpellConst.cs
+1 -1
View File
@@ -2078,7 +2078,7 @@ namespace Framework.Constants
NeedsAmmoData = 0x80000, NeedsAmmoData = 0x80000,
BinarySpell = 0x100000, BinarySpell = 0x100000,
SchoolmaskNormalWithMagic = 0x200000, SchoolmaskNormalWithMagic = 0x200000,
LiquidAura = 0x400000, DeprecatedLiquidAura = 0x400000,
IsTalent = 0x800000, IsTalent = 0x800000,
AuraCannotBeSaved = 0x1000000 AuraCannotBeSaved = 0x1000000
} }
Source/Game/Entities/Object/WorldObject.cs
+1 -1
View File
@@ -3169,7 +3169,7 @@ namespace Game.Entities
float hoverDelta = myHover - searcherHover; float hoverDelta = myHover - searcherHover;
if (hoverDelta != 0.0f) if (hoverDelta != 0.0f)
effectiveReach = MathF.Sqrt(effectiveReach * effectiveReach - hoverDelta * hoverDelta); effectiveReach = MathF.Sqrt(Math.Max(effectiveReach * effectiveReach - hoverDelta * hoverDelta, 0.0f));
} }
} }
Source/Game/Movement/Generators/TargetMovement.cs
-1
View File
@@ -141,7 +141,6 @@ namespace Game.Movement
float x, y, z; float x, y, z;
if (updateDestination || _path == null) if (updateDestination || _path == null)
{ {
float hoverDiff = Math.Abs(owner.GetHoverOffset() - GetTarget().GetHoverOffset());
if (_offset == 0) if (_offset == 0)
{ {
if (GetTarget().IsWithinDistInMap(owner, SharedConst.ContactDistance)) if (GetTarget().IsWithinDistInMap(owner, SharedConst.ContactDistance))
Source/Game/Spells/SpellManager.cs
+9 -1
View File
@@ -2905,7 +2905,15 @@ namespace Game.Entities
spellInfo.AttributesCu &= ~SpellCustomAttributes.CanCrit; spellInfo.AttributesCu &= ~SpellCustomAttributes.CanCrit;
} }
Log.outInfo(LogFilter.ServerLoading, "Loaded spell custom attributes in {0} ms", Time.GetMSTimeDiffToNow(oldMSTime)); // add custom attribute to liquid auras
foreach (var liquid in CliDB.LiquidTypeStorage.Values)
{
if (liquid.SpellID != 0)
foreach (SpellInfo spellInfo in _GetSpellInfo(liquid.SpellID))
spellInfo.AttributesCu |= SpellCustomAttributes.AuraCannotBeSaved;
}
Log.outInfo(LogFilter.ServerLoading, "Loaded SpellInfo custom attributes in {0} ms", Time.GetMSTimeDiffToNow(oldMSTime));
} }
void ApplySpellFix(int[] spellIds, Action<SpellInfo> fix) void ApplySpellFix(int[] spellIds, Action<SpellInfo> fix)