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

Purge "initial vanilla inventory" from playerdata, and pushed it to the SSC config creation if not existing.

Browse source
This commit is contained in:
Zack Piispanen 2015-03-16 12:47:44 -04:00
parent 2658aa1c6d
commit 8a7aae9143
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TShockAPI/FileTools.cs
View file

@ -17,6 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using TShockAPI.ServerSideCharacters; using TShockAPI.ServerSideCharacters;
@ -112,6 +113,19 @@ namespace TShockAPI
TShock.ServerSideCharacterConfig = ServerSideConfig.Read(ServerSideCharacterConfigPath); TShock.ServerSideCharacterConfig = ServerSideConfig.Read(ServerSideCharacterConfigPath);
// Add all the missing config properties in the json file // Add all the missing config properties in the json file
} }
else
{
TShock.ServerSideCharacterConfig = new ServerSideConfig
{
StartingInventory =
new List<NetItem>()
{
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); TShock.ServerSideCharacterConfig.Write(ServerSideCharacterConfigPath);
} }

12
TShockAPI/TSPlayer.cs
View file

@ -1140,18 +1140,6 @@ namespace TShockAPI
{ {
this.inventory[i] = new NetItem(); 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++) for (int i = 0; i < TShock.ServerSideCharacterConfig.StartingInventory.Count; i++)
{ {