Commit graph

607 commits

Author SHA1 Message Date
Lucas Nicodemus
9bcec7b2d8 Update changelog 2022-02-25 00:48:43 -08:00
Chris
2f31322b5f
Update CHANGELOG.md 2022-02-23 20:53:31 +10:30
Chris
a3cde701f1
Merge branch 'general-devel' into general-devel 2022-02-22 19:17:08 +10:30
Chris
ed12236c52
Merge branch 'general-devel' into feature/grow-code-dupe 2022-02-22 18:51:01 +10:30
Lucas Nicodemus
6591b455fc Version tick: 4.5.13 2022-02-16 19:45:57 -08:00
0x3fcf1bbd
6922c413be Merge branch 'general-devel' of https://github.com/Pryaxis/TShock into Pryaxis-general-devel 2022-02-16 11:43:06 +01:00
ELI JOSEPH BRADLEY
956b5a5243
Move to correct section of CHANGELOG. 2022-02-14 13:06:34 -06:00
ELI JOSEPH BRADLEY
86527974de
Update CHANGELOG.md 2022-02-14 12:25:31 -06:00
0x3fcf1bbd
a48bac3631
Updated CHANGELOG.md 2022-02-01 16:06:34 +01:00
0x3fcf1bbd
7f0daba593
Updated CHANGELOG.md 2022-01-26 14:23:06 +01:00
0x3fcf1bbd
2b64c04b7f
Fixed CHANGELOG.md
Also merged the two "Upcoming changes" headers.
2022-01-23 16:10:43 +01:00
0x3fcf1bbd
c0ab5ae98f
Updated CHANGELOG.md 2022-01-16 00:00:14 +01:00
shell
add6c4cbee
Merge branch 'Pryaxis:general-devel' into general-devel 2022-01-03 20:03:19 +06:00
Lucas Nicodemus
e42da74f85 Merge remote-tracking branch 'tru321/general-devel' into general-devel 2021-12-12 12:35:13 -08:00
tru321
3ab630e731
Update CHANGELOG.md 2021-12-12 19:13:29 +08:00
tru321
8d54033404
Update CHANGELOG.md 2021-12-08 12:04:47 +08:00
James Puleo
e9b86b8f62
Improved the /grow command to reduce code duplication, use TileID
constants for less ambiguous types.
2021-12-07 03:12:39 -05:00
James Puleo
fe3a59f84a
Fixed rejection check inside of HandlePaintTile to account for the
Paint Sprayer (or Architect Gizmo Pack) being inside your inventory,
rather than on an accessory slot.
2021-12-07 02:42:27 -05:00
Lucas Nicodemus
d50ebfea37 Merge remote-tracking branch 'drunderscore/feature/bouncer-reject-out-of-bounds-npc-talk' into general-devel 2021-12-04 22:35:37 -08:00
James Puleo
4dab0802a1
Added the OnSignRead handler in GetDataHandlers, and added the
`SignRead` event.

Added check to ensure the sign being read is within world bounds (x >= 0
&& y >= 0 && x < Main.maxTilesX && y < Main.maxTilesY)
2021-12-03 21:11:23 -05:00
James Puleo
97f33fea63
Added check to HandleNpcTalk to ensure the passed NPC index is within
bounds (>= -1 && < `Main.maxNPCs`).
2021-12-03 19:57:46 -05:00
shell627
6155b31778 Merge remote-tracking branch 'upstream/general-devel' into general-devel 2021-12-03 15:40:37 +06:00
Lucas Nicodemus
ce056f1ce5 Merge remote-tracking branch 'agaspace/general-devel' into general-devel 2021-12-01 22:59:04 -08:00
tru321
c6b870a480
Update CHANGELOG.md
Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2021-12-01 15:49:59 +08:00
tru321
0d60d1654d
Update CHANGELOG.md 2021-12-01 14:51:53 +08:00
shell627
acb6a96245 Fix item dupe via /logout & NPC (#2495 issue) 2021-12-01 00:18:02 +06:00
AkjaHAsLk1IALk0MasH
9910725258 Update CHANGELOG.md 2021-11-30 20:45:56 +07:00
Chris
b6d56422ff
Update CHANGELOG.md 2021-11-30 19:51:18 +10:30
AkjaHAsLk1IALk0MasH
6cec7e71cd Fixed the ability to spawn Zenith projectile with non-original items. 2021-11-28 15:35:50 +07:00
Lucas Nicodemus
87d5b476ea Add current gamemode to /worldmode
To help debug #2516, this commit adds the currently running game mode to
/worldinfo. I didn't bother converting this in the dictionary back since
my primary goal by adding it right now is to debug the currently running
mode, not to necessarily try to parse the data.
2021-11-27 17:32:46 -08:00
Lucas Nicodemus
ce9f3b244c Merge changelog upcoming release section & update 2021-11-27 17:21:04 -08:00
Lucas Nicodemus
0751f0cb5a Merge remote-tracking branch 'agaspace/general-devel' into general-devel 2021-11-27 17:15:44 -08:00
Zoom L1
2f30ef20fd
Update CHANGELOG.md 2021-11-27 11:28:04 +07:00
Stargazing Koishi
0437342038
Update CHANGELOG.md 2021-11-26 07:00:50 -08:00
Lucas Nicodemus
74e178e119 Version tick: 4.5.10 2021-11-25 21:47:35 -08:00
Lucas Nicodemus
996229b9af Force shutdown server if SIGINT is received twice
Previously, I updated the SIGINT handler so that it would safely shut
down. This is because I'm an idiot and like most people like me, I use
CTRL + C as my exclusive way to close all programs in the command line
environment. This poses a risk because it doesn't save the world and
shuts down improperly.

However, I forgot that Terraria has interactive menus that you can't
exit from. So, in these menus, the only way out was CTRL + C. @Onusai
reported this, so this changes the behavior a second time.

Now, when passing SIGINT, you can pass it twice. This will cause the
program to actually exit on the second time, such as when you're stuck
at a menu. Hooray.
2021-11-25 11:26:09 -08:00
Lucas Nicodemus
8cf7d164cb Version tick: 4.5.9
This commit also bumps the submodule for TSAPI to support Terraria
1.4.3.2.
2021-11-24 18:57:41 -08:00
Lucas Nicodemus
984a3ca460 Update changelog 2021-11-23 22:53:46 -08:00
Lucas Nicodemus
e714f8ea58 Verison tick: 4.5.8 2021-11-23 18:31:55 -08:00
Lucas Nicodemus
50821e7e89 Fix changelog location for GHSA-6w5v-hxr3-m2wx 2021-11-23 18:29:57 -08:00
Arthri
a1eaf285cd Merge remote-tracking branch 'parent/general-devel' into fix-invalid-place-style 2021-11-24 09:21:40 +08:00
Arthri
c5eeae8590 Add changelog entry 2021-11-23 17:23:44 +08:00
Lucas Nicodemus
e303071dce Fix firework command failing without color
After updates to the firework command, a guard was lost, allowing the
switch statement that selected the color to execute on a parameter that
was empty. A guard was added to prevent falling into the switch
statement without enough arguments to match a color.

The default type of firework was manually set to a red firework.

Fixes #2507
2021-11-22 22:16:56 -08:00
Lucas Nicodemus
a01b48ead5 Remove dead code: DBTools.cs 2021-11-22 19:27:40 -08:00
Lucas Nicodemus
320bbad051 Version tick: 4.5.7 2021-11-22 18:07:30 -08:00
Lucas Nicodemus
ce8623e84e Add support for 1.4.3.1 via submodule update 2021-11-22 18:02:40 -08:00
Lucas Nicodemus
9416e8f1e2 Remove DIY password hashing crypto
The old system for hashing passwords and permitting users to select
their algorithm has been deprecated and phased out since 2015. This
removes the remaining functions for hashing passwords to clear the way
for .NET5/6 and for OTAPI 3.

In 211b70ca37, I allowed blank passwords
to upgrade to bcrypt hashes. However, the minimum password length has
been 4 historically for a long time. So I don't actually assume a lot of
users have blank passwords, so I think there are very few, if any of the
old hashes laying around.

So therefore, I think this is pretty much safe to merge.
2021-11-22 10:26:57 -08:00
Lucas Nicodemus
614211d7a1 Fix respawning players from the server console 2021-11-21 16:35:47 -08:00
Lucas Nicodemus
211b70ca37 Upgrade blank passwords to bcrypt hashes
Previously, blank passwords were not upgraded to bcrypt hashes. This is
annoying and problematic because it makes it difficult to remove the old
password hashing system because those passwords might still be checked
against non-bcrypt hashes.
2021-11-21 14:44:53 -08:00
Lucas Nicodemus
b17c4cfc13 Add support for disabling IP bans by default
Some proxy users find it irritating when their proxy IP is banned by the
ban command. This helps those users find justice in the world.
2021-11-21 14:30:59 -08:00