From cf7fd6da23aa2c8e424f103df06274ec76ca9947 Mon Sep 17 00:00:00 2001 From: Deathmax Date: Fri, 8 Jul 2011 21:20:07 +0800 Subject: [PATCH] Ban/KickOnHardcoreOnlyDeath is now Ban/KickOnHardcoreDeath - Any hardcore deaths can be acted on. Ban/KickOnHardcoreDeath will no longer trigger with a magic mirror. --- TShockAPI/ConfigFile.cs | 4 ++-- TShockAPI/GetDataHandlers.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs index 88f82be0..acf5a1a2 100644 --- a/TShockAPI/ConfigFile.cs +++ b/TShockAPI/ConfigFile.cs @@ -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; diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index b67f9e9a..7ffa8d48 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -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");