cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed new positions after realignment not saving. Fixed Dealer info not clearing from the db sometimes.

Browse Source
This commit is contained in:
Filip Maj 2019-06-08 14:46:19 -04:00
parent e91960040c
commit a07aa12783
4 changed files with 67 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
FFXIVClassic Map Server/Database.cs
View File

@ -1635,6 +1635,48 @@ namespace FFXIVClassic_Map_Server
} }
} }
public static void UpdateItemPositions(List<InventoryItem> updated)
{
using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
{
try
{
conn.Open();
string query = @"
UPDATE characters_inventory
SET slot = @slot
WHERE serverItemId = @serverItemId;
";
using (MySqlTransaction trans = conn.BeginTransaction())
{
using (MySqlCommand cmd = new MySqlCommand(query, conn, trans))
{
foreach (InventoryItem item in updated)
{
cmd.Parameters.Clear();
cmd.Parameters.AddWithValue("@serverItemId", item.uniqueId);
cmd.Parameters.AddWithValue("@slot", item.slot);
cmd.ExecuteNonQuery();
}
trans.Commit();
}
}
}
catch (MySqlException e)
{
Program.Log.Error(e.ToString());
}
finally
{
conn.Dispose();
}
}
}
public static void SetQuantity(ulong serverItemId, int quantity) public static void SetQuantity(ulong serverItemId, int quantity)
{ {
using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD))) using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))

2
FFXIVClassic Map Server/WorldManager.cs
View File

@ -1638,14 +1638,12 @@ namespace FFXIVClassic_Map_Server
bazaarPackage.RemoveItem(reward); bazaarPackage.RemoveItem(reward);
reward.SetNormal(); reward.SetNormal();
player.AddItem(reward); player.AddItem(reward);
Database.ClearDealingInfo(reward);
if (seek != null) if (seek != null)
{ {
bazaarPackage.RemoveItem(seek); bazaarPackage.RemoveItem(seek);
seek.SetNormal(); seek.SetNormal();
player.AddItem(seek); player.AddItem(seek);
Database.ClearDealingInfo(seek);
} }
player.CheckBazaarFlags(); player.CheckBazaarFlags();

9
FFXIVClassic Map Server/actors/chara/ItemPackage.cs
View File

@ -826,6 +826,8 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
private void DoRealign() private void DoRealign()
{ {
List<InventoryItem> positionUpdate = new List<InventoryItem>();
int lastNullSlot = -1; int lastNullSlot = -1;
for (int i = 0; i < endOfListIndex; i++) for (int i = 0; i < endOfListIndex; i++)
@ -838,7 +840,12 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
else if (list[i] != null && lastNullSlot != -1) else if (list[i] != null && lastNullSlot != -1)
{ {
list[lastNullSlot] = list[i]; list[lastNullSlot] = list[i];
if (list[lastNullSlot].GetOfferedTo() != null)
{
list[lastNullSlot].UpdateOfferedSlot((ushort)(list[lastNullSlot].slot - lastNullSlot));
}
list[lastNullSlot].slot = (ushort)lastNullSlot; list[lastNullSlot].slot = (ushort)lastNullSlot;
positionUpdate.Add(list[lastNullSlot]);
list[i] = null; list[i] = null;
isDirty[lastNullSlot] = true; isDirty[lastNullSlot] = true;
isDirty[i] = true; isDirty[i] = true;
@ -848,6 +855,8 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
if (lastNullSlot != -1) if (lastNullSlot != -1)
endOfListIndex = lastNullSlot; endOfListIndex = lastNullSlot;
Database.UpdateItemPositions(positionUpdate);
} }
#endregion #endregion

15
FFXIVClassic Map Server/dataobjects/InventoryItem.cs
View File

@ -271,6 +271,9 @@ namespace FFXIVClassic_Map_Server.dataobjects
public void SetNormal() public void SetNormal()
{ {
if (dealingMode != 0 || tags[0] == TAG_ATTACHED)
Database.ClearDealingInfo(this);
tags[0] = 0; tags[0] = 0;
tagValues[0] = 0; tagValues[0] = 0;
dealingVal = 0; dealingVal = 0;
@ -319,6 +322,18 @@ namespace FFXIVClassic_Map_Server.dataobjects
Database.SetDealingInfo(this); Database.SetDealingInfo(this);
} }
public void UpdateOfferedSlot(ushort delta)
{
if (dealingMode == DEALINGMODE_REFERENCED)
{
ushort attachedItemPackage = (ushort)((dealingAttached1 >> 16) & 0xFF);
ushort attachedSlot = (ushort)(dealingAttached1 & 0xFF);
attachedSlot -= delta;
dealingAttached1 = ((attachedItemPackage << 16) | attachedSlot);
Database.SetDealingInfo(this);
}
}
protected void SetSeeking() protected void SetSeeking()
{ {
tags[0] = TAG_ATTACHED; tags[0] = TAG_ATTACHED;