From 740ad4d6c3226e69122f901a9736d23e821de267 Mon Sep 17 00:00:00 2001 From: Patrikk Date: Sun, 10 Dec 2017 20:14:54 +0100 Subject: [PATCH 1/2] Add missing "if handled - return" code. --- TShockAPI/TShock.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index ee403eab..5d59dc8a 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -522,6 +522,11 @@ namespace TShockAPI /// args - The NameCollisionEventArgs object. private void NetHooks_NameCollision(NameCollisionEventArgs args) { + if (args.Handled) + { + return; + } + string ip = Utils.GetRealIP(Netplay.Clients[args.Who].Socket.GetRemoteAddress().ToString()); var player = Players.First(p => p != null && p.Name == args.Name && p.Index != args.Who); From 6f044b2123c744e5673d63e883958be15770c91d Mon Sep 17 00:00:00 2001 From: Patrikk Date: Sun, 10 Dec 2017 20:37:59 +0100 Subject: [PATCH 2/2] Adding missing Changelog. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1a85365..e50ee4a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large. ## Upcoming Changes +* API: Added return in OnNameCollision if hook has been handled. (@Patrikkk) * API: Added hooks for item, projectile and tile bans (@deadsurgeon42) * API: Changed `PlayerHooks` permission hook mechanisms to allow negation from hooks (@deadsurgeon42) * API: New WorldGrassSpread hook which shold allow corruption/crimson/hallow creep config options to work (@DeathCradle)