Commit graph

3940 commits

Author SHA1 Message Date
Lucas Nicodemus
e42da74f85 Merge remote-tracking branch 'tru321/general-devel' into general-devel 2021-12-12 12:35:13 -08:00
tru321
f20ce4aaa9
Update Bouncer.cs 2021-12-10 10:57:56 +08:00
tru321
e0d6252693
Update GetDataHandlers.cs 2021-12-10 10:53:58 +08:00
tru321
16f7c876e1
Apply suggestions from code review
Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2021-12-08 14:44:03 +08:00
tru321
26a46ef40c
Update Bouncer.cs 2021-12-08 11:48:55 +08:00
tru321
d4befdeff0
Update Bouncer.cs 2021-12-08 11:10:12 +08:00
tru321
bd7b1c1460
Update GetDataHandlers.cs 2021-12-08 11:05:33 +08: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
f3b1a84821 Version tick: 4.5.12 2021-12-06 21:31:03 -08:00
Lucas Nicodemus
47b95e7518 Merge remote-tracking branch 'agaspace/patch-1' into general-devel 2021-12-05 16:32:06 -08: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
Zoom L1
5230598ba3
Comments updated 2021-12-04 10:37:16 +07: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
Zoom L1
77ded28826
Corrected customDeathReason in OnPlayerDamage
Previously it was called for absolutely any damage from the player.
2021-12-02 22:13:25 +07:00
Lucas Nicodemus
ce056f1ce5 Merge remote-tracking branch 'agaspace/general-devel' into general-devel 2021-12-01 22:59:04 -08:00
AkjaHAsLk1IALk0MasH
823293ed43 Updated code comments 2021-12-02 10:03:36 +07:00
tru321
0b1da29cf8
Update GetDataHandlers.cs 2021-12-01 14:35:02 +08:00
tru321
a2a13ce494
Added DataHandler for NpcTalk
This should stopping unregistered and logged out players to interact with NPC. Which prevent them smuggling or duplicating items via NPC items slot.
2021-12-01 13:44:41 +08:00
AkjaHAsLk1IALk0MasH
a00512fcf4 Added protection to OnPlayerDamage 2021-11-30 21:14:53 +07:00
AkjaHAsLk1IALk0MasH
cdeec8aa04 Added protection in OnKillMe 2021-11-30 20:53:19 +07:00
AkjaHAsLk1IALk0MasH
8f69c6e767 Created a new field in config. 2021-11-30 20:50:51 +07:00
Chris
9b18dc5d59
Merge branch 'general-devel' into general-devel 2021-11-30 18:23:38 +10:30
AkjaHAsLk1IALk0MasH
df5c118055 Added comments to help other developers understand what I used and why 2021-11-30 14:36:19 +07:00
AkjaHAsLk1IALk0MasH
77032ccbea Renamed value in config 2021-11-30 14:23:49 +07:00
AkjaHAsLk1IALk0MasH
1a62d1dfed Added ai[0] check 2021-11-30 14:22:41 +07:00
Lucas Nicodemus
f3f0fc8886 Version tick: 4.5.11 2021-11-29 21:26:31 -08:00
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
0751f0cb5a Merge remote-tracking branch 'agaspace/general-devel' into general-devel 2021-11-27 17:15:44 -08:00
AkjaHAsLk1IALk0MasH
76b0d9e563 Removed unnecessary code comments. 2021-11-27 11:59:49 +07:00
AkjaHAsLk1IALk0MasH
606b9e43d7 Fixed the minimum value that made the "Bouncer" not work properly 2021-11-27 11:57:48 +07:00
Zoom L1
246c67a622
Updated the dictionaries. 2021-11-27 09:34:14 +07:00
Zoom L1
f11ffd2b91
Fixed the maximum and minimum values.
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
2021-11-27 09:30:52 +07:00
AkjaHAsLk1IALk0MasH
bf605a2127 Added "Bouncer," which prohibits the creation of large projectiles. 2021-11-27 00:00:55 +07:00
AkjaHAsLk1IALk0MasH
85a4656274 Added values for AI[]. 2021-11-26 23:52:05 +07:00
Stargazing Koishi
db8d56cba7
Update BuffId typo 2021-11-26 06:54:56 -08:00
Stargazing Koishi
2217d63dc7
Update new buffs for NPC
The new TentacleSpike buff is allowed
2021-11-26 06:52:30 -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
Zoom L1
f98df0e4a3
Merge pull request #2447 from AgaSpace/patch-1
Add the ability to change the player's pvp mode
2021-11-23 22:52:47 -08:00
Lucas Nicodemus
e714f8ea58 Verison tick: 4.5.8 2021-11-23 18:31:55 -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
350d76c315 Fix bad XML(unescaped ampersand) 2021-11-23 17:13:02 +08:00
Arthri
aa5cb13247 Fix bad XML(no opening <summary) 2021-11-23 17:12:49 +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
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