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

Core: Updated to 11.1.0

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/23624ed75abc8cbb77bb2e24a08e0836e4c41db5)
This commit is contained in:
Hondacrx
2025-06-16 14:47:31 -04:00
parent b6bccbad44
commit 7fd54e6175
65 changed files with 4240 additions and 3968 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Creature.cs
+7 -4
View File
@@ -2945,7 +2945,7 @@ namespace Game.Entities
int scalingLevelMin = m_unitData.ScalingLevelMin;
int scalingLevelMax = m_unitData.ScalingLevelMax;
int scalingLevelDelta = m_unitData.ScalingLevelDelta;
int scalingFactionGroup = m_unitData.ScalingFactionGroup;
byte scalingFactionGroup = m_unitData.ScalingFactionGroup;
uint targetLevel = unitTarget.m_unitData.EffectiveLevel;
if (targetLevel == 0)
targetLevel = unitTarget.GetLevel();
@@ -3804,7 +3804,12 @@ namespace Game.Entities
m_unitData.WriteCreate(data, flags, this, target);
if (m_vendorData != null)
{
if (EntityFragmentsHolder.IsIndirectFragment(EntityFragment.FVendor_C))
data.WriteUInt8(1); // IndirectFragmentActive: FVendor_C
m_vendorData.WriteCreate(data, flags, this, target);
}
}
public override void BuildValuesUpdate(WorldPacket data, UpdateFieldFlag flags, Player target)
@@ -3869,9 +3874,7 @@ namespace Game.Entities
public override void ClearUpdateMask(bool remove)
{
if (m_vendorData != null)
m_values.ClearChangesMask(m_vendorData);
m_values.ClearChangesMask(m_vendorData);
base.ClearUpdateMask(remove);
}
Source/Game/Entities/Creature/CreatureData.cs
+2 -2
View File
@@ -167,9 +167,9 @@ namespace Game.Entities
stats.Flags[0] = (uint)creatureDifficulty.TypeFlags;
stats.Flags[1] = creatureDifficulty.TypeFlags2;
stats.CreatureType = (int)CreatureType;
stats.CreatureType = (sbyte)CreatureType;
stats.CreatureFamily = (int)Family;
stats.Classification = (int)Classification;
stats.Classification = (sbyte)Classification;
for (uint i = 0; i < SharedConst.MaxCreatureKillCredit; ++i)
stats.ProxyCreatureID[i] = KillCredit[i];
Source/Game/Entities/Creature/Gossip.cs
+4 -4
View File
@@ -17,7 +17,7 @@ namespace Game.Misc
public class GossipMenu
{
public uint AddMenuItem(int gossipOptionId, int orderIndex, GossipOptionNpc optionNpc, string optionText, uint language,
GossipOptionFlags flags, int? gossipNpcOptionId, uint actionMenuId, uint actionPoiId, bool boxCoded, uint boxMoney,
GossipOptionFlags flags, int? gossipNpcOptionId, uint actionMenuId, uint actionPoiId, bool boxCoded, ulong boxMoney,
string boxText, int? spellId, int? overrideIconId, uint sender, uint action)
{
Cypher.Assert(_menuItems.Count <= SharedConst.MaxGossipMenuItems);
@@ -261,7 +261,7 @@ namespace Game.Misc
opt.GossipOptionID = item.GossipOptionID;
opt.OptionNPC = item.OptionNpc;
opt.OptionFlags = (byte)(item.BoxCoded ? 1 : 0); // makes pop up box password
opt.OptionCost = (int)item.BoxMoney; // money required to open menu, 2.0.3
opt.OptionCost = item.BoxMoney; // money required to open menu, 2.0.3
opt.OptionLanguage = item.Language;
opt.Flags = item.Flags;
opt.OrderIndex = (int)item.OrderIndex;
@@ -757,7 +757,7 @@ namespace Game.Misc
public GossipOptionFlags Flags;
public int? GossipNpcOptionID;
public bool BoxCoded;
public uint BoxMoney;
public ulong BoxMoney;
public string BoxText;
public int? SpellID;
public int? OverrideIconID;
@@ -801,7 +801,7 @@ namespace Game.Misc
public uint ActionPoiID;
public int? GossipNpcOptionID;
public bool BoxCoded;
public uint BoxMoney;
public ulong BoxMoney;
public string BoxText;
public uint BoxBroadcastTextId;
public int? SpellID;