From 95946ba06057335c421aa32119d0d4481252f8a0 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Sun, 15 Jan 2012 17:33:43 -0500 Subject: [PATCH] added a no clip override in the config file, this hopefully will allow you to stop all that dumb teleporting when you accidentally no clip. --- TShockAPI/ConfigFile.cs | 2 ++ TShockAPI/GetDataHandlers.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs index f8cc983b..75d97cee 100644 --- a/TShockAPI/ConfigFile.cs +++ b/TShockAPI/ConfigFile.cs @@ -203,6 +203,8 @@ namespace TShockAPI [Description("Ignores checking to see if player 'can' kill a projectile")] public bool IgnoreProjKill = false; + [Description("Ignores all no clip checks for players")] public bool IgnoreNoClip = false; + public static ConfigFile Read(string path) { if (!File.Exists(path)) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 8ee3e152..9763a7e9 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1437,7 +1437,7 @@ namespace TShockAPI } if (!args.Player.Group.HasPermission(Permissions.ignorenoclipdetection) && - Collision.SolidCollision(pos, args.TPlayer.width, args.TPlayer.height)) + Collision.SolidCollision(pos, args.TPlayer.width, args.TPlayer.height) && !TShock.Config.IgnoreNoClip) { int lastTileX = (int) (args.Player.LastNetPosition.X/16f); int lastTileY = (int) (args.Player.LastNetPosition.Y/16f);