From 86e741a3cd769b77550a6023f9150f5aa6b1681e Mon Sep 17 00:00:00 2001 From: White Date: Fri, 27 May 2016 14:13:15 +0930 Subject: [PATCH] Removed obsolete DCU config options --- TShockAPI/ConfigFile.cs | 4 ---- TShockAPI/GetDataHandlers.cs | 18 ------------------ 2 files changed, 22 deletions(-) diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs index 451d690c..5a61f2c4 100755 --- a/TShockAPI/ConfigFile.cs +++ b/TShockAPI/ConfigFile.cs @@ -446,10 +446,6 @@ namespace TShockAPI [Description("Whether we should limit only the max failed login requests, or all login requests")] public bool RESTLimitOnlyFailedLoginRequests = true; - [Obsolete("This is being removed in future versions of TShock due to Terraria fixes.")] - [Description("Enable the DCU. Very dangerous; can destroy world without consequence.")] public bool - VeryDangerousDoNotChangeEnableDrillContainmentUnit = true; - [Description("Show backup autosave messages.")] public bool ShowBackupAutosaveMessages = true; /// diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 73139175..e494c421 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -3237,15 +3237,6 @@ namespace TShockAPI return false; } - if (type == BuffID.DrillMount && !TShock.Config.VeryDangerousDoNotChangeEnableDrillContainmentUnit) - { - TShock.Log.ConsoleInfo("The configuration option disabling the drill containment unit will be removed at a future date."); - TShock.Log.ConsoleInfo("As of Terraria 1.3.0.5, this option is no longer defaulted to kick DCU users."); - TShock.Log.ConsoleInfo("This is because the DCU is now covered by TShock protection systems."); - TShock.Utils.ForceKick(TShock.Players[id], "The Drill Containment Unit is disabled."); - return true; - } - args.Player.SendData(PacketTypes.PlayerAddBuff, "", id); return true; } @@ -3539,15 +3530,6 @@ namespace TShockAPI { args.TPlayer.buffTime[i] = 0; } - - if (buff == BuffID.DrillMount && !TShock.Config.VeryDangerousDoNotChangeEnableDrillContainmentUnit) - { - TShock.Log.ConsoleInfo("The configuration option disabling the drill containment unit will be removed at a future date."); - TShock.Log.ConsoleInfo("As of Terraria 1.3.0.5, this option is no longer defaulted to kick DCU users."); - TShock.Log.ConsoleInfo("This is because the DCU is now covered by TShock protection systems."); - TShock.Utils.ForceKick(TShock.Players[id], "The Drill Containment Unit is disabled."); - return true; - } }