From 0536fe5775a1d1e29865ced182caca7ca7ab0aac Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Thu, 31 May 2012 17:47:01 -0400 Subject: [PATCH] remove some more region stuff. --- TShockAPI/GetDataHandlers.cs | 18 ------------------ TShockAPI/TShock.cs | 26 +++----------------------- 2 files changed, 3 insertions(+), 41 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index f99cc013..50baf8d9 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1646,24 +1646,6 @@ namespace TShockAPI if (args.Player.Dead && TShock.Config.PreventDeadModification) return true; - if (args.Player.AwaitingName) - { - //todo: We need to replace this call to the region manage plugins call - /*var protectedregions = TShock.Regions.InAreaRegionName(tileX, tileY); - if (protectedregions.Count == 0) - { - args.Player.SendMessage("Region is not protected", Color.Yellow); - } - else - { - string regionlist = string.Join(",", protectedregions.ToArray()); - args.Player.SendMessage("Region Name(s): " + regionlist, Color.Yellow); - }*/ - args.Player.SendTileSquare(tileX, tileY); - args.Player.AwaitingName = false; - return true; - } - if (args.Player.AwaitingTempPoint > 0) { args.Player.TempPoints[args.Player.AwaitingTempPoint - 1].X = tileX; diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 17b42c3e..cddc9497 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -522,6 +522,8 @@ namespace TShockAPI StatTracker.CheckIn(); FixChestStacks(); + + } private void FixChestStacks() @@ -1318,17 +1320,7 @@ namespace TShockAPI return true; } - //todo: Replace with calls to the new region plugin. - /*if (!player.Group.HasPermission(Permissions.editspawn) && !Regions.CanBuild(tileX, tileY, player) && - Regions.InArea(tileX, tileY)) - { - if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.RPm) > 2000){ - player.SendMessage("Region protected from changes.", Color.Red); - player.RPm=DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; - } - - return true; - }*/ + if (Config.DisableBuild) { if (!player.Group.HasPermission(Permissions.editspawn)) @@ -1370,19 +1362,7 @@ namespace TShockAPI } return true; } - //todo: Replace with calls to the new region plugin. - /*if (!player.Group.HasPermission(Permissions.editspawn) && !Regions.CanBuild(tileX, tileY, player) && - Regions.InArea(tileX, tileY)) - { - - if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.RPm) > 2000){ - player.SendMessage("Region protected from changes.", Color.Red); - player.RPm=DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; - } - return true; - }*/ - if (Config.DisableBuild) { if (!player.Group.HasPermission(Permissions.editspawn))