From 390649aa56852728aa7d428da4b14ec6c5b0b04b Mon Sep 17 00:00:00 2001
From: Lucas Nicodemus <shank@shanked.me>
Date: Thu, 21 Dec 2017 18:41:34 -0700
Subject: [PATCH] Move OnGetSection to Bouncer

Bonus: Introduces a new GetDataHandledEventArgs for use in events that
have players, data, and need to be handled.

I was originally going to modify GetDataHandlerArgs, but that comes from
the EventArgs class of args that isn't handled, and changing that to
extend HandledEventArgs would imply we care or check to see if those are
handled and we don't so we're stuck with this implementation for a
teenie tiny bit.
---
 TShockAPI/Bouncer.cs         | 23 +++++++++++++
 TShockAPI/GetDataHandlers.cs | 63 +++++++++++++++++++++++++++++-------
 2 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs
index 8e81d802..b0b6a427 100644
--- a/TShockAPI/Bouncer.cs
+++ b/TShockAPI/Bouncer.cs
@@ -42,6 +42,7 @@ namespace TShockAPI
 		{
 			// Setup hooks
 
+			GetDataHandlers.GetSection += OnGetSection;
 			GetDataHandlers.PlaceItemFrame += OnPlaceItemFrame;
 			GetDataHandlers.GemLockToggle += OnGemLockToggle;
 			GetDataHandlers.PlaceTileEntity += OnPlaceTileEntity;
@@ -64,6 +65,28 @@ namespace TShockAPI
 			GetDataHandlers.TileEdit += OnTileEdit;
 		}
 
+		internal void OnGetSection(object sender, GetDataHandlers.GetSectionEventArgs args)
+		{
+			if (args.Player.RequestedSection)
+			{
+				args.Handled = true;
+				return;
+			}
+			args.Player.RequestedSection = true;
+
+			if (String.IsNullOrEmpty(args.Player.Name))
+			{
+				TShock.Utils.ForceKick(args.Player, "Blank name.", true);
+				args.Handled = true;
+				return;
+			}
+
+			if (!args.Player.HasPermission(Permissions.ignorestackhackdetection))
+			{
+				args.Player.IsDisabledForStackDetection = args.Player.HasHackedItemStacks(true);
+			}
+		}
+
 		/// <summary>Fired when an item frame is placed for anti-cheat detection.</summary>
 		/// <param name="sender">The object that triggered the event.</param>
 		/// <param name="args">The packet arguments that the event has.</param>
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 9162acd2..60ace5df 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -58,6 +58,19 @@ namespace TShockAPI
 		}
 	}
 
+	/// <summary>
+	/// A custom HandledEventArgs that contains TShock's TSPlayer for the triggering uesr and the Terraria MP data stream.
+	/// Differentiated by GetDataHandlerArgs because it can be handled and responds to being handled.
+	/// </summary>
+	public class GetDataHandledEventArgs : HandledEventArgs
+	{
+		/// <summary>The TSPlayer that triggered the event.</summary>
+		public TSPlayer Player { get; set; }
+
+		/// <summary>The raw MP packet data associated with the event.</summary>
+		public MemoryStream Data { get; set; }
+	}
+
 	public static class GetDataHandlers
 	{
 		private static Dictionary<PacketTypes, GetDataHandlerDelegate> GetDataHandlerDelegates;
@@ -1903,21 +1916,47 @@ namespace TShockAPI
 			return true;
 		}
 
+		/// <summary>The arguments to a GetSection packet.</summary>
+		public class GetSectionEventArgs : GetDataHandledEventArgs
+		{
+			/// <summary>The X position requested. Or -1 for spawn.</summary>
+			public int X { get; set; }
+
+			/// <summary>The Y position requested. Or -1 for spawn.</summary>
+			public int Y { get; set; }
+		}
+
+		/// <summary>The hook for a GetSection event.</summary>
+		public static HandlerList<GetSectionEventArgs> GetSection = new HandlerList<GetSectionEventArgs>();
+
+		/// <summary>Fires a GetSection event.</summary>
+		/// <param name="player">The TSPlayer that caused the GetSection.</param>
+		/// <param name="data">The raw MP protocol data.</param>
+		/// <param name="x">The x coordinate requested or -1 for spawn.</param>
+		/// <param name="y">The y coordinate requested or -1 for spawn.</param>
+		/// <returns>bool</returns>
+		private static bool OnGetSection(TSPlayer player, MemoryStream data, int x, int y)
+		{
+			if (GetSection == null)
+				return false;
+
+			var args = new GetSectionEventArgs
+			{
+				Player = player,
+				Data = data,
+				X = x,
+				Y = y,
+			};
+
+			GetSection.Invoke(null, args);
+			return args.Handled;
+		}
+
 		private static bool HandleGetSection(GetDataHandlerArgs args)
 		{
-			if (args.Player.RequestedSection)
-				return true;
-			args.Player.RequestedSection = true;
-			if (String.IsNullOrEmpty(args.Player.Name))
-			{
-				TShock.Utils.ForceKick(args.Player, "Blank name.", true);
-				return true;
-			}
 
-			if (!args.Player.HasPermission(Permissions.ignorestackhackdetection))
-			{
-				args.Player.IsDisabledForStackDetection = args.Player.HasHackedItemStacks(true);
-			}
+			if (OnGetSection(args.Player, args.Data, args.Data.ReadInt32(), args.Data.ReadInt32()))
+				return true;
 
 			if (TShock.Utils.ActivePlayers() + 1 > TShock.Config.MaxSlots &&
 				!args.Player.HasPermission(Permissions.reservedslot))