From 8a7aae91431929a68bf7bba55b0b12ebf6b8e4b7 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Mon, 16 Mar 2015 12:47:44 -0400 Subject: [PATCH] Purge "initial vanilla inventory" from playerdata, and pushed it to the SSC config creation if not existing. --- TShockAPI/FileTools.cs | 14 ++++++++++++++ TShockAPI/TSPlayer.cs | 12 ------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/TShockAPI/FileTools.cs b/TShockAPI/FileTools.cs index 071da3fc..65e2d56d 100644 --- a/TShockAPI/FileTools.cs +++ b/TShockAPI/FileTools.cs @@ -17,6 +17,7 @@ along with this program. If not, see . */ using System; +using System.Collections.Generic; using System.IO; using TShockAPI.ServerSideCharacters; @@ -112,6 +113,19 @@ namespace TShockAPI TShock.ServerSideCharacterConfig = ServerSideConfig.Read(ServerSideCharacterConfigPath); // Add all the missing config properties in the json file } + else + { + TShock.ServerSideCharacterConfig = new ServerSideConfig + { + StartingInventory = + new List() + { + new NetItem() {netID = -15, stack = 1, prefix = 0}, + new NetItem() {netID = -13, stack = 1, prefix = 0}, + new NetItem() {netID = -16, stack = 1, prefix = 0} + } + }; + } TShock.ServerSideCharacterConfig.Write(ServerSideCharacterConfigPath); } diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 17fa8667..7f9fbced 100755 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -1140,18 +1140,6 @@ namespace TShockAPI { this.inventory[i] = new NetItem(); } - this.inventory[0].netID = -15; - this.inventory[0].stack = 1; - if (player.TPlayer.inventory[0] != null && player.TPlayer.inventory[0].netID == -15) - this.inventory[0].prefix = player.TPlayer.inventory[0].prefix; - this.inventory[1].netID = -13; - this.inventory[1].stack = 1; - if (player.TPlayer.inventory[1] != null && player.TPlayer.inventory[1].netID == -13) - this.inventory[1].prefix = player.TPlayer.inventory[1].prefix; - this.inventory[2].netID = -16; - this.inventory[2].stack = 1; - if (player.TPlayer.inventory[2] != null && player.TPlayer.inventory[2].netID == -16) - this.inventory[2].prefix = player.TPlayer.inventory[2].prefix; for (int i = 0; i < TShock.ServerSideCharacterConfig.StartingInventory.Count; i++) {