themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix NetItem serialization/deserialization

Browse source
This commit is contained in:
MarioE 2015-05-04 22:28:41 -04:00
parent d5fb8726cc
commit ad5ec1c252
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/DB/CharacterManager.cs
View file

@ -77,7 +77,7 @@ namespace TShockAPI.DB
playerData.maxHealth = reader.Get<int>("MaxHealth"); playerData.maxHealth = reader.Get<int>("MaxHealth");
playerData.mana = reader.Get<int>("Mana"); playerData.mana = reader.Get<int>("Mana");
playerData.maxMana = reader.Get<int>("MaxMana"); playerData.maxMana = reader.Get<int>("MaxMana");
playerData.inventory = reader.Get<string>("Inventory").Split('~').Select(NetItem.Parse).ToArray(); playerData.inventory = reader.Get<string>("Inventory").Split('~').Select(NetItem.Parse).ToArray();
playerData.spawnX = reader.Get<int>("spawnX"); playerData.spawnX = reader.Get<int>("spawnX");
playerData.spawnY = reader.Get<int>("spawnY"); playerData.spawnY = reader.Get<int>("spawnY");
playerData.hair = reader.Get<int?>("hair"); playerData.hair = reader.Get<int?>("hair");
@ -107,7 +107,7 @@ namespace TShockAPI.DB
{ {
var inventory = new StringBuilder(); var inventory = new StringBuilder();
var items = TShock.ServerSideCharacterConfig.StartingInventory; var items = new List<NetItem>(TShock.ServerSideCharacterConfig.StartingInventory);
if (items.Count < NetItem.MaxInventory) if (items.Count < NetItem.MaxInventory)
items.AddRange(new NetItem[NetItem.MaxInventory - items.Count]); items.AddRange(new NetItem[NetItem.MaxInventory - items.Count]);

11
TShockAPI/NetItem.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Newtonsoft.Json;
using Terraria; using Terraria;
namespace TShockAPI namespace TShockAPI
@ -9,6 +10,7 @@ namespace TShockAPI
/// <summary> /// <summary>
/// Represents an item. /// Represents an item.
/// </summary> /// </summary>
[JsonObject(MemberSerialization.OptIn)]
public struct NetItem public struct NetItem
{ {
/// <summary> /// <summary>
@ -26,9 +28,12 @@ namespace TShockAPI
/// </summary> /// </summary>
public static readonly int MaxInventory = 83; public static readonly int MaxInventory = 83;
private readonly int _netId; [JsonProperty("netID")]
private readonly byte _prefixId; private int _netId;
private readonly int _stack; [JsonProperty("prefix")]
private byte _prefixId;
[JsonProperty("stack")]
private int _stack;
/// <summary> /// <summary>
/// Gets the net ID. /// Gets the net ID.