From 825e7fe3a3a1314383f624bc2c52ce29d1a00d7c Mon Sep 17 00:00:00 2001 From: Chris <2648373+QuiCM@users.noreply.github.com> Date: Tue, 24 Jul 2018 21:38:03 +0000 Subject: [PATCH 1/4] Update README.md Discord -> telegram --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8261fadc..8ff5a0ce 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ TShock is a toolbox for Terraria servers and communities. That toolbox is jam pa * Download: [Stable](https://github.com/TShock/TShock/releases) or [Experimental](https://travis.tshock.co/). * Read [the documentation](https://tshock.readme.io/) to quickly get up to speed. -* Join [Discord](https://discord.gg/XUJdH58) to get help, chat, and enjoy some swell Australian company. +* Join [Telegram](https://t.me/pryaxis) to get help, chat, and enjoy some swell Australian company. * Download [other plugins](https://tshock.co/xf/index.php?resources/) to supercharge your server. ---- From e08ba6b36243960493f4b28f64c5c29b3a21b92c Mon Sep 17 00:00:00 2001 From: Chris <2648373+QuiCM@users.noreply.github.com> Date: Fri, 17 Aug 2018 00:45:58 +0930 Subject: [PATCH 2/4] Update README.md Re-add discord --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8ff5a0ce..b58a52a2 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,8 @@ TShock is a toolbox for Terraria servers and communities. That toolbox is jam pa * Download: [Stable](https://github.com/TShock/TShock/releases) or [Experimental](https://travis.tshock.co/). * Read [the documentation](https://tshock.readme.io/) to quickly get up to speed. -* Join [Telegram](https://t.me/pryaxis) to get help, chat, and enjoy some swell Australian company. +* Join [Discord](https://discord.gg/Cav9nYX) for quick questions and answers +* Join [Telegram](https://t.me/pryaxis) for in-depth support, conversation, and some swell Australian company. * Download [other plugins](https://tshock.co/xf/index.php?resources/) to supercharge your server. ---- @@ -214,7 +215,7 @@ You might find yourself wondering where these fields are. Pryaxis provides the d Finally, you may be interested in developing other Terraria Server API plugins. The [TShockResources](https://github.com/TShockResources) organization has several plugins you can look at and build on. TShock is itself a plugin, and most plugins are open source. This gives you ample room to figure out where to go next. -Need help? Join us on [#tshock-programming in Discord](https://discord.gg/ABtrBaY). +Need help? Join us on [Telegram](https://t.me/pryaxis) or [Discord](https://discord.gg/Cav9nYX). ## Code of Conduct From 4df8a6f38f2083b12b9a9566ccf05f7160e83f7e Mon Sep 17 00:00:00 2001 From: Ruby Rose Date: Sun, 23 Sep 2018 14:29:59 +0300 Subject: [PATCH 3/4] add another case to the exception message regex --- TShockAPI/DB/UserManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/DB/UserManager.cs b/TShockAPI/DB/UserManager.cs index c819c40e..0c0dc5ff 100644 --- a/TShockAPI/DB/UserManager.cs +++ b/TShockAPI/DB/UserManager.cs @@ -76,7 +76,7 @@ namespace TShockAPI.DB catch (Exception ex) { // Detect duplicate user using a regexp as Sqlite doesn't have well structured exceptions - if (Regex.IsMatch(ex.Message, "Username.*not unique")) + if (Regex.IsMatch(ex.Message, "Username.*not unique|UNIQUE constraint failed: Users\\.Username")) throw new UserAccountExistsException(account.Name); throw new UserAccountManagerException("AddUser SQL returned an error (" + ex.Message + ")", ex); } From e8cf8879f4dd8b87fdedd761d00525416c29fcc6 Mon Sep 17 00:00:00 2001 From: Ruby Rose Date: Sun, 23 Sep 2018 14:33:41 +0300 Subject: [PATCH 4/4] added changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d783712..a4a9b410 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * 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) +* Fixed a missing case in UserManager exception handling, which caused a rather cryptic console error instead of the intended error message (@deadsurgeon42) * Fixed saving when one player is one the server and another one joins (@MarioE) * Fixed /spawnmob not spawning negative IDs (@MarioE) * Validated tile placement on PlaceObject; clients can no longer place frames, paintings etc with dirt blocks (@bartico6, @ProfessorXZ)