Commit graph

3589 commits

Author SHA1 Message Date
Rustly
0a01ae6d83
Merge branch 'general-devel' into general-devel 2020-06-18 16:53:14 -05:00
Patrikkk
b19e95b99d
Merge branch 'general-devel' into removebouldercheck 2020-06-18 16:09:21 +02:00
Rustly
01bae0475d apply the rest of fixes for snake flute, prevent players from seeing the npc perm error on join 2020-06-15 13:32:42 -05:00
Rustly
013ef4ce98 fix snake rope thingy 2020-06-15 12:37:49 -05:00
Patrikkk
865748fedf
Merge branch 'general-devel' into removebouldercheck 2020-06-13 22:58:36 +02:00
stacey
4949410cfa
minor grammar update 2020-06-13 13:26:34 -04:00
stacey
067006a092
Add clarity to !HasPermission error messages
And a few other minor formatting/grammar changes.
2020-06-13 13:13:46 -04:00
Patrikkk
a80e88b85b
Merge branch 'general-devel' into ontileeditcleanup 2020-06-13 12:13:20 +02:00
Patrikkk
2ed9e320c1 Bouncer OnTileEdit - Remove redundant Boulder placement check 2020-06-13 11:58:36 +02:00
Chris
f02d8ba6bf
Merge branch 'general-devel' into general-devel 2020-06-13 15:51:38 +09:30
Patrikkk
6bad423d6a
Merge branch 'general-devel' into addpersonalstoragecheck 2020-06-12 14:29:39 +02:00
Patrikkk
e2fad8e77e
Merge branch 'general-devel' into ontileeditcleanup 2020-06-12 14:28:48 +02:00
Patrikkk
c03ac50f81 Bouncer OnTileEdit remove personal storage SSC check.
We are covering/tracking these features properly now in SSC, thus they are unnedded.
2020-06-12 10:38:13 +02:00
Patrikkk
822579277b
Update TShockAPI/Bouncer.cs Add space to comment
Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2020-06-12 10:12:38 +02:00
Patrikkk
f5e1510f58 Bouncer OnTileEdit - Add new personalstorage tiles for ssc check.
We do not allow piggybank and safe to be placed if SSC is enabled.
The DefendersFroge and VoidVault have the same functionality as far as I know. So adding these two missing tiles.
2020-06-12 00:56:51 +02:00
Patrikkk
51a0732f0c Bouncer OnTileEdit - Code cleanup
I moved the block that checks for max tile and wall types to the start of the method where it checks for the editData (type) being smaller than 0.
I merged these checks, so it gets caught under the same hood.

We had a block that was a bit chaotic and hard to understand.
I've split it up so its a bit clearer. It checks if the tile data that is being placed, comes from the item they are selecting. There were additional checks merged in it, because terraria does not set the createTile of some items, so without the check it would have get caught as invalid placement.
I added a valid placement check for one of these, which is the Ice Rod/Ice block placement.
Handle action if the player is using icerod but not placing ice block.
There is no need for a check here on Dirtbomb, because the player only sends the projectile, the tiles are being placed by the server.
2020-06-12 00:27:47 +02:00
Patrikkk
cbcdfce593 Revert TShockAPI.csproj to its original state. 2020-06-11 23:44:36 +02:00
Patrikkk
fbf7b5791a Bouncer OnTileEdit - Fix issue with placing ropes.
This fixes #1980 .
The issue came from checking for recently created ropecoil projectile. But didn't actually check if the player is holding a ropecoil item.
Because of this, users could not place regular ropes.
2020-06-11 23:41:27 +02:00
KZ
53e7065561 merge latest changes from general-devel and resolve Changelog conflicts 2020-06-11 13:32:30 -07:00
Chris
b633f60567 Resolve STS issue #1999 2020-06-10 13:27:33 +09:30
Patrikkk
f81155dac1
Merge branch 'general-devel' into bounceronnewproj 2020-06-09 17:11:58 +02:00
Patrikkk
5decc50bd9 Bouncer OnNewProjectile - Add checks on directional projectiles.
**This commit does not have any effect on actual gameplay as of current project state, but it does let valid projectile creation pass through instead of getting caught up in Bouncer. That catch is currently disabled for the time being, until all valid projectile creation check is added.**

Things would have get caught up in our bouncer eversince 1.4. We commented out the catch (the disable and handling) for now, but none of these new projectiles were added to let them pass.
Renaming stabProjectile to directionalProjectile. Adding staffs to directionalProjectiles
Adding check for GolfClubHelper projectile.

Left in a debug check for golfball projectile. I would want to see if the reject gets triggered in a proper server enviroment. I didn't want to handle the projectile just yet.
Adding GolfBallItemIDs list in Handlers.LandGolfBallInCupHandler.cs
2020-06-09 14:04:27 +02:00
Patrikkk
6c22cfd57c Bouncer OnTileData - Add more checks on ReplaceTile/ReplaceWall 2020-06-09 00:39:04 +02:00
Patrikkk
0d0641c8c0 Bouncer OnTileEdit - Adding more checks on ReplaceTile action. 2020-06-09 00:23:23 +02:00
Patrikkk
4f66e660d4 Bouncer OnTileEdit - Add tile replace action to tileban check.
Tiny change, but a pressing matter. My smallest PR ever? hahah.
2020-06-09 00:01:57 +02:00
KZ
a844a54763 Use Region blocks for better outlining readability
https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/preprocessor-directives/preprocessor-region
2020-06-07 16:35:52 -07:00
KZ
aa85a9860c Reorder sections, format section titles 2020-06-07 14:10:16 -07:00
KZ
fda0ae720b reorganizing within categories 2020-06-07 13:58:57 -07:00
KZ
a27e43f758 Initial sorting, need to merge in changes from master though 2020-06-07 13:22:21 -07:00
Chris
ff38075426
Merge branch 'general-devel' into patch-14 2020-06-07 12:41:49 +09:30
Chris
ce21d56b86
Merge branch 'general-devel' into patch-17 2020-06-07 12:36:42 +09:30
Chris
325813a57b
Merge branch 'general-devel' into fixfishoutnpc2 2020-06-07 12:32:45 +09:30
moisterrific
2c1833342e
Add martians to validEvents response message 2020-06-06 22:54:14 -04:00
Patrikkk
156cf4930b FishOutNPC - Fix some rods not fishing out NPCs.
I was wrong, not all bobbers are named "Bobber".
Just found that Projectile now has an extra field which determines if the given type is a bobber. This field is set in Projectile.SetDefaults method in the following logic
`((type >= 360 && type <= 366) || type == 381 || type == 382 || type == 760 || type == 775)`
I think it is reasonable to use the bobber field, as it would be updateproof too.
Tested and working. Fixes #1985
2020-06-06 22:28:37 +02:00
moisterrific
470da46511
Add new perms and move more perms to trustedadmin
Add new journey mode research perm and move all existing journey perms from owner to trustedadmin. Also added pylon tp to default and added /spawn perm to admin.
2020-06-06 00:28:21 -04:00
moisterrific
e90d84be02
Condense if/else statements
And clean up OnNPCStrike while I'm at it
2020-06-05 11:53:21 -04:00
Chris
67859f5dca
Merge branch 'general-devel' into sts-patch-1 2020-06-05 13:12:22 +09:30
Chris
3d018a27af
Merge branch 'general-devel' into patch-14 2020-06-05 12:17:42 +09:30
Chris
c99deae9cc Add some sanity checking around tile object sizes 2020-06-05 12:16:24 +09:30
Chris
5e3f70382d
Merge branch 'general-devel' into patch-13 2020-06-05 12:09:14 +09:30
moisterrific
e009febdca
Add config defined threshold kicks to Bouncer
along with various other minor refinements
2020-06-04 22:25:34 -04:00
Patrikkk
bcdd0dc8be GetDataHandler - Add missing PlayerInfo data. 2020-06-05 03:46:04 +02:00
moisterrific
fa6a39aafe
Add KickOnThresholdBroken for more thresholds
There's KickOnDamageThresholdBroken but no option for kick for other thresholds, thought I should add it.
2020-06-04 20:51:00 -04:00
Lucas Nicodemus
c8aa67ec4d
Merge branch 'general-devel' into patch-12 2020-06-04 17:26:58 -07:00
Patrikkk
739fa69571
Merge branch 'general-devel' into fixfishoutnpc 2020-06-04 12:28:12 +02:00
Patrikkk
00161088e7 OnFishoutNPC - Use ConsoleDebug for message. 2020-06-04 12:25:55 +02:00
Patrikkk
2fd5941821 OnFishout - Fixing #1985 - Making debug messages clearer. Modifying redundant check.
The actual issue was a missing `!` beind IsInRange. If player was doing a valid fishing event, it handled the NPC spawning.
I've split up the checks to make clearer debug messages.
Main.projectile objects are never null. Bobber projectile is never killed when the FishOutNPC event occurs. The projectile type in the check can only be 0 if no recent projectile found that has the name Bobber.
2020-06-04 12:23:48 +02:00
Chris
fe4679ba95 Remove invalid dictionary entries in CreativePowerHandler 2020-06-04 19:40:41 +09:30
moisterrific
91c3557610
Change DebugLogs to true by default
Given that this is a pre-release and it no longer makes the CLI unreadable I think it should be on by default to make troubleshooting easier.
2020-06-03 22:54:51 -04:00
Patrikkk
7487afafb6 SyncTilePickingHandler - Remove redundant check. Properly document method. 2020-06-02 19:26:25 +02:00