From 740ad4d6c3226e69122f901a9736d23e821de267 Mon Sep 17 00:00:00 2001 From: Patrikk Date: Sun, 10 Dec 2017 20:14:54 +0100 Subject: [PATCH 1/5] 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 7181757dd3014f0f07bdfbcba1b8b1eabbb4275f Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sun, 10 Dec 2017 12:26:54 -0700 Subject: [PATCH 2/5] Changelog bot message is more prodding If people keep ignoring the bot, I'm going to make it block merging too. --- .github/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/config.yml b/.github/config.yml index c39fdab9..34b33fce 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -1,5 +1,5 @@ updateDocsComment: > - Thanks for the pull request! TShock's maintainers would like you to go ahead and give yourself credit by updating the `CHANGELOG.md` file before this gets merged. This helps us document changes to TShock, as well as give you credit for your work. You deserve it! :sparkles: + Thanks for the pull request! TShock's maintainers would like you to go ahead and give yourself credit by updating the `CHANGELOG.md` as soon as you can. Your pull request will likely not be accepted without this. This both helps us document changes to TShock, as well as give you credit for your work. You deserve it, so go take credit! :sparkles: updateDocsWhiteList: - bug @@ -7,4 +7,4 @@ updateDocsWhiteList: updateDocsTargetFiles: - README - - CHANGELOG.md \ No newline at end of file + - CHANGELOG.md From 6f044b2123c744e5673d63e883958be15770c91d Mon Sep 17 00:00:00 2001 From: Patrikk Date: Sun, 10 Dec 2017 20:37:59 +0100 Subject: [PATCH 3/5] 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) From 1f79e14bd7d4296c859b74514f7cd64c445aaaeb Mon Sep 17 00:00:00 2001 From: quake1337 <3310937+bartico6@users.noreply.github.com> Date: Mon, 11 Dec 2017 01:12:27 +0100 Subject: [PATCH 4/5] Make TShock pull OTAPI from the correct folder on build --- TShockAPI/TShockAPI.csproj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj index 957f805b..a612f444 100644 --- a/TShockAPI/TShockAPI.csproj +++ b/TShockAPI/TShockAPI.csproj @@ -71,11 +71,9 @@ ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - + False - ..\TerrariaServerAPI\TerrariaServerAPI\bin\Debug\OTAPI.dll - ..\TerrariaServerAPI\TerrariaServerAPI\bin\Release\OTAPI.dll - ..\TerrariaServerAPI\TerrariaServerAPI\bin\$(Configuration)\OTAPI.dll + ..\TerrariaServerAPI\TerrariaServerAPI\bin\$(ConfigurationName)\OTAPI.dll From a5e196178e31d9a444ed9b7f2fc542c84f7e7989 Mon Sep 17 00:00:00 2001 From: quake1337 <3310937+bartico6@users.noreply.github.com> Date: Mon, 11 Dec 2017 01:16:10 +0100 Subject: [PATCH 5/5] Add credit --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e50ee4a5..d4eafb1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Update OTAPI to 2.0.0.31, which also updates Newtonsoft.Json to 10.0.3 (@Ryozuki) * Fixed DumpItems() from trying to dump older versions of certain items (negative item IDs). (@Zaicon) * Added the `/dump-reference-data` command, which when run, runs Utils.Dump() and outputs Terraria reference data to the server folder. (@hakusaro) +* Fixed builds to not require a specific version of OTAPI and to not fail when in Release mode (@bartico6) ## TShock 4.3.24 * Updated OpenTerraria API to 1.3.5.3 (@DeathCradle)