themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

EmojiHandler - Adding requested PR changes. Changing debug message. Fix wordings.

Browse source
This commit is contained in:
Patrikkk 2020-06-02 11:20:04 +02:00
parent c94d15e634
commit acdbfecaf1
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Bouncer.cs
View file

@ -47,7 +47,7 @@ namespace TShockAPI
GetDataHandlers.SendTileSquare += STSHandler.OnReceiveSendTileSquare; GetDataHandlers.SendTileSquare += STSHandler.OnReceiveSendTileSquare;
EmojiHandler = new Handlers.EmojiHandler(); EmojiHandler = new Handlers.EmojiHandler();
GetDataHandlers.Emoji += EmojiHandler.OnEmoji; GetDataHandlers.Emoji += EmojiHandler.OnReceiveEmoji;
// Setup hooks // Setup hooks
GetDataHandlers.GetSection += OnGetSection; GetDataHandlers.GetSection += OnGetSection;

8
TShockAPI/Handlers/EmojiHandler.cs
View file

@ -7,22 +7,22 @@ using System.Threading.Tasks;
namespace TShockAPI.Handlers namespace TShockAPI.Handlers
{ {
/// <summary> /// <summary>
/// Handles an exploit and checks for permissions. /// Handles emoji packets and checks for validity and permissions
/// </summary> /// </summary>
public class EmojiHandler 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) 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; args.Handled = true;
return; return;
} }
if (!args.Player.HasPermission(Permissions.sendemoji)) 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; args.Handled = true;
return; return;
} }