From acdbfecaf130a41d2b1ff2a5f53e1ea4e0d55b05 Mon Sep 17 00:00:00 2001 From: Patrikkk Date: Tue, 2 Jun 2020 11:20:04 +0200 Subject: [PATCH] EmojiHandler - Adding requested PR changes. Changing debug message. Fix wordings. --- TShockAPI/Bouncer.cs | 2 +- TShockAPI/Handlers/EmojiHandler.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index 5bd42ffd..534d670b 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -47,7 +47,7 @@ namespace TShockAPI GetDataHandlers.SendTileSquare += STSHandler.OnReceiveSendTileSquare; EmojiHandler = new Handlers.EmojiHandler(); - GetDataHandlers.Emoji += EmojiHandler.OnEmoji; + GetDataHandlers.Emoji += EmojiHandler.OnReceiveEmoji; // Setup hooks GetDataHandlers.GetSection += OnGetSection; diff --git a/TShockAPI/Handlers/EmojiHandler.cs b/TShockAPI/Handlers/EmojiHandler.cs index 8606884d..b21cd53e 100644 --- a/TShockAPI/Handlers/EmojiHandler.cs +++ b/TShockAPI/Handlers/EmojiHandler.cs @@ -7,22 +7,22 @@ using System.Threading.Tasks; namespace TShockAPI.Handlers { /// - /// Handles an exploit and checks for permissions. + /// Handles emoji packets and checks for validity and permissions /// public class EmojiHandler { - public void OnEmoji(object sender, GetDataHandlers.EmojiEventArgs args) + public void OnReceiveEmoji(object sender, GetDataHandlers.EmojiEventArgs args) { if (args.PlayerIndex != args.Player.Index) { - TShock.Log.ConsoleError($"EmojiHandler: Packet is spoofing to be player ID {args.PlayerIndex}! - From [{args.Player.Index}] {args.Player.Name}"); + TShock.Log.ConsoleError($"EmojiHandler: Emoji packet rejected for ID spoofing. Expected {args.Player.Index}, received {args.PlayerIndex} from {args.Player.Name}."); args.Handled = true; return; } if (!args.Player.HasPermission(Permissions.sendemoji)) { - args.Player.SendErrorMessage("You have no permission to send emotes!"); + args.Player.SendErrorMessage("You do not have permission to send emotes!"); args.Handled = true; return; }