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

Ban/KickOnHardcoreOnlyDeath is now Ban/KickOnHardcoreDeath - Any hardcore deaths can be acted on.

Browse source 
Ban/KickOnHardcoreDeath will no longer trigger with a magic mirror.
This commit is contained in:
Deathmax 2011-07-08 21:20:07 +08:00
parent 23e5f96e01
commit cf7fd6da23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/ConfigFile.cs
View file

@ -60,8 +60,8 @@ namespace TShockAPI
public bool RememberLeavePos = false;
public bool HardcoreOnly = false;
public bool KickOnHardcoreOnlyDeath = false;
public bool BanOnHardcoreOnlyDeath = false;
public bool KickOnHardcoreDeath = false;
public bool BanOnHardcoreDeath = false;
public bool AutoSave = true;

6
TShockAPI/GetDataHandlers.cs
View file

@ -549,12 +549,12 @@ namespace TShockAPI
int spawnx = args.Data.ReadInt32();
int spawny = args.Data.ReadInt32();
if (args.Player.InitSpawn)
if (args.Player.InitSpawn && args.TPlayer.inventory[args.TPlayer.selectedItem].type != 50)
{
if (TShock.Config.HardcoreOnly && (TShock.Config.KickOnHardcoreOnlyDeath || TShock.Config.BanOnHardcoreOnlyDeath))
if ((TShock.Config.KickOnHardcoreDeath || TShock.Config.BanOnHardcoreDeath))
if (args.TPlayer.selectedItem != 50)
{
if (TShock.Config.BanOnHardcoreOnlyDeath)
if (TShock.Config.BanOnHardcoreDeath)
{
if (!Tools.Ban(args.Player, "Death results in a ban"))
Tools.ForceKick(args.Player, "Death results in a ban, but can't ban you");