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

Core: Updated to 11.2.5.63704

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/53068a94e88991ae7196fb247df4b7ca2e47e554)
This commit is contained in:
Hondacrx
2025-12-16 13:57:09 -05:00
parent ed33a88776
commit 3a890782b5
57 changed files with 3079 additions and 2630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Auras/Aura.cs
+3
View File
@@ -262,6 +262,9 @@ namespace Game.Spells
else if (!auraData.Flags.HasFlag(AuraFlags.NoCaster))
auraData.CastUnit = aura.GetCasterGUID();
if (!aura.GetCastItemGUID().IsEmpty())
auraData.CastItem = aura.GetCastItemGUID();
if (auraData.Flags.HasFlag(AuraFlags.Duration))
{
auraData.Duration = aura.GetMaxDuration();
Source/Game/Spells/SpellEffects.cs
+19 -3
View File
@@ -5935,13 +5935,29 @@ namespace Game.Spells
return;
newConfig.TraitSystemID = CliDB.TraitTreeStorage.LookupByKey(effectInfo.MiscValue).TraitSystemID;
int existingConfigForSystem = target.m_activePlayerData.TraitConfigs.FindIndexIf(config =>
TraitSystemRecord traitSystem = CliDB.TraitSystemStorage.LookupByKey(newConfig.TraitSystemID);
if (traitSystem == null)
return;
switch (traitSystem.GetVariationType())
{
case TraitSystemVariationType.None:
newConfig.VariationID = 0;
break;
case TraitSystemVariationType.Spec:
newConfig.VariationID = (int)target.GetPrimarySpecialization();
break;
default:
return;
}
int existingConfigIdForSystem = target.m_activePlayerData.TraitConfigs.FindIf(config =>
{
return config.Type == (int)TraitConfigType.Generic
&& config.TraitSystemID == newConfig.TraitSystemID;
});
}).Item1;
if (existingConfigForSystem < 0)
if (existingConfigIdForSystem == 0)
target.CreateTraitConfig(newConfig);
}
Source/Game/Spells/TraitManager.cs
+7 -1
View File
@@ -139,7 +139,7 @@ namespace Game
if (tree != null)
tree.SubTrees.Add(subTree);
_traitSubTrees[(int)traitSubTree.ID] = subTree;
_traitSubTrees[(int)traitSubTree.Id] = subTree;
}
foreach (var (_, traitNodeGroup) in CliDB.TraitNodeGroupStorage)
@@ -470,6 +470,12 @@ namespace Game
}
}
break;
case TraitCurrencyType.TraitSourcedPlayerDataElement:
if (currency.PlayerDataElementAccountID != 0)
currencies[currency.Id] += player.GetDataElementAccount((uint)currency.CurrencyTypesID);
else if (currency.PlayerDataElementCharacterID != 0)
currencies[currency.Id] += player.GetDataElementCharacter((uint)currency.CurrencyTypesID);
break;
default:
break;
}