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

Updated to 8.2.0.31429 (scripts disabled atm, they still need updated)

Browse Source 
Code Port from TrinityCore https://github.com/TrinityCore/TrinityCore
Casc from WoW-Tools https://github.com/WoW-Tools/CASCExplorer
This commit is contained in:
hondacrx
2019-08-14 11:20:42 -04:00
parent e4d500f4b5
commit 125e3b3ac7
232 changed files with 12268 additions and 14670 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Guilds/Guild.cs
+10 -11
View File
@@ -1313,7 +1313,7 @@ namespace Game.Guilds
public bool LoadBankItemFromDB(SQLFields field)
{
byte tabId = field.Read<byte>(46);
byte tabId = field.Read<byte>(45);
if (tabId >= _GetPurchasedTabsSize())
{
Log.outError(LogFilter.Guild, "Invalid tab for item (GUID: {0}, id: {1}) in guild bank, skipped.",
@@ -2137,14 +2137,14 @@ namespace Game.Guilds
itemInfo.Item.ItemID = tabItem ? tabItem.GetEntry() : 0;
itemInfo.Count = (int)(tabItem ? tabItem.GetCount() : 0);
itemInfo.Charges = tabItem ? Math.Abs(tabItem.GetSpellCharges()) : 0;
itemInfo.OnUseEnchantmentID = 0/*int32(tabItem->GetItemSuffixFactor())*/;
itemInfo.OnUseEnchantmentID = 0/*int32(tabItem.GetItemSuffixFactor())*/;
itemInfo.Flags = 0;
itemInfo.Locked = false;
if (tabItem != null)
{
byte i = 0;
foreach (ItemDynamicFieldGems gemData in tabItem.GetGems())
foreach (SocketedGem gemData in tabItem.m_itemData.Gems)
{
if (gemData.ItemId != 0)
{
@@ -2218,12 +2218,12 @@ namespace Game.Guilds
itemInfo.Item.ItemID = tabItem.GetEntry();
itemInfo.Count = (int)tabItem.GetCount();
itemInfo.Charges = Math.Abs(tabItem.GetSpellCharges());
itemInfo.EnchantmentID = tabItem.GetItemRandomPropertyId(); // verify that...
itemInfo.OnUseEnchantmentID = 0/*int32(tabItem->GetItemSuffixFactor())*/;
itemInfo.EnchantmentID = (int)tabItem.GetEnchantmentId(EnchantmentSlot.Perm);
itemInfo.OnUseEnchantmentID = (int)tabItem.GetEnchantmentId(EnchantmentSlot.Use);
itemInfo.Flags = 0;
byte i = 0;
foreach (ItemDynamicFieldGems gemData in tabItem.GetGems())
foreach (SocketedGem gemData in tabItem.m_itemData.Gems)
{
if (gemData.ItemId != 0)
{
@@ -2477,7 +2477,7 @@ namespace Game.Guilds
m_name = player.GetName();
m_level = (byte)player.getLevel();
m_class = player.GetClass();
_gender = (Gender)player.GetByteValue(PlayerFields.Bytes3, PlayerFieldOffsets.Bytes3OffsetGender);
_gender = (Gender)(byte)player.m_playerData.NativeSex;
m_zoneId = player.GetZoneId();
m_accountId = player.GetSession().GetAccountId();
m_achievementPoints = player.GetAchievementPoints();
@@ -3213,7 +3213,7 @@ namespace Game.Guilds
public bool LoadItemFromDB(SQLFields field)
{
byte slotId = field.Read<byte>(47);
byte slotId = field.Read<byte>(46);
uint itemGuid = field.Read<uint>(0);
uint itemEntry = field.Read<uint>(1);
if (slotId >= GuildConst.MaxBankSlots)
@@ -3340,8 +3340,8 @@ namespace Game.Guilds
stmt.AddValue(3, item.GetGUID().GetCounter());
trans.Append(stmt);
item.SetGuidValue(ItemFields.Contained, ObjectGuid.Empty);
item.SetGuidValue(ItemFields.Owner, ObjectGuid.Empty);
item.SetContainedIn(ObjectGuid.Empty);
item.SetOwnerGUID(ObjectGuid.Empty);
item.FSetState(ItemUpdateState.New);
item.SaveToDB(trans); // Not in inventory and can be saved standalone
}
@@ -3349,7 +3349,6 @@ namespace Game.Guilds
return true;
}
ulong m_guildId;
byte m_tabId;
Item[] m_items = new Item[GuildConst.MaxBankSlots];
Source/Game/Guilds/GuildManager.cs
+1 -1
View File
@@ -383,7 +383,7 @@ namespace Game
uint count = 0;
do
{
ulong guildId = result.Read<ulong>(45);
ulong guildId = result.Read<ulong>(44);
Guild guild = GetGuildById(guildId);
if (guild)
guild.LoadBankItemFromDB(result.GetFields());