themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions
4814 commits 1 branch 1 tag 88 MiB
Commit graph

4814 commits

This branch
This branch
All branches
Author SHA1 Message Date
Patrikkk
447cf9d21e Update CHANGELOG.md 2020-06-13 12:08:58 +02:00
Patrikkk
2ed9e320c1 Bouncer OnTileEdit - Remove redundant Boulder placement check 2020-06-13 11:58:36 +02:00
Chris
f282b2a48a
Merge pull request #2020 from kubedzero/general-devel 
Reorganize ConfigFile.cs for more orderly config.json output
 2020-06-13 16:03:13 +09:30
Chris
f02d8ba6bf
Merge branch 'general-devel' into general-devel 2020-06-13 15:51:38 +09:30
Chris
12e2ef20f2
Merge pull request #2044 from Pryaxis/addpersonalstoragecheck 
Bouncer OnTileEdit - Remove person storage tile check for SSC
 2020-06-13 15:51:13 +09:30
Patrikkk
6bad423d6a
Merge branch 'general-devel' into addpersonalstoragecheck 2020-06-12 14:29:39 +02:00
Patrikkk
6f4d8201dc
Merge pull request #2042 from Pryaxis/fixropes 
Fixropes
 2020-06-12 14:26:54 +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
cbcdfce593 Revert TShockAPI.csproj to its original state. 2020-06-11 23:44:36 +02:00
Patrikkk
9700550657 Update CHANGELOG.md 2020-06-11 23:42:51 +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
Chris
704b8430f1
Merge pull request #2029 from Pryaxis/bounceronnewproj 
Bouncer OnNewProjectile - Add checks on directional projectiles.
 2020-06-10 12:03:58 +09:30
Patrikkk
f81155dac1
Merge branch 'general-devel' into bounceronnewproj 2020-06-09 17:11:58 +02:00
Patrikkk
e0b9c8b4f3
Merge pull request #2024 from Pryaxis/fixtilebanbypass 
Bouncer OnTileEdit - Add tile/wall replace action to TileEdit bouncer checks.
 2020-06-09 17:10:45 +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
42c2acafec Update CHANGELOG.md 2020-06-07 14:13:53 -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
Lucas Nicodemus
ab1e63beee
Add changelog warning to maka comment 2020-06-06 20:37:01 -07:00
Chris
90146dfa03
Merge pull request #1997 from moisterrific/patch-15 
Add additional onXthresholdBroken to changelog
 2020-06-07 12:51:12 +09:30
Chris
9b9ccfd6f1
Merge branch 'general-devel' into patch-15 2020-06-07 12:48:41 +09:30
Chris
5f03f68a6f
Merge pull request #1996 from moisterrific/patch-14 
Add config defined threshold kicks to Bouncer
 2020-06-07 12:47:13 +09:30
Chris
ff38075426
Merge branch 'general-devel' into patch-14 2020-06-07 12:41:49 +09:30
Chris
8bd6d72cf7
Merge pull request #2015 from moisterrific/patch-17 
Add martians to validEvents response message
 2020-06-07 12:41:36 +09:30
Chris
ce21d56b86
Merge branch 'general-devel' into patch-17 2020-06-07 12:36:42 +09:30
Chris
3ffccf9799
Merge pull request #2010 from Pryaxis/fixfishoutnpc2 
FishOutNPC - Fix some rods not fishing out NPCs.
 2020-06-07 12:36:33 +09:30
Chris
325813a57b
Merge branch 'general-devel' into fixfishoutnpc2 2020-06-07 12:32:45 +09:30
Chris
313213a068
Merge pull request #2001 from moisterrific/patch-16 
Add new perms and move more perms to trustedadmin
 2020-06-07 12:32:12 +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
7d4ce5af69
Add latest commits regarding new permissions 2020-06-06 00:36:29 -04: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
Lucas Nicodemus
31e79a3918
Update changelog for 4.4.0 pr11 2020-06-04 21:29:50 -07:00
Chris
014ea733c7
Merge pull request #1998 from Pryaxis/sts-patch-1 
Add some sanity checking around tile object sizes
 2020-06-05 13:15:33 +09:30
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
07f0dc1540
Merge pull request #1995 from moisterrific/patch-13 
Add KickOnThresholdBroken for more thresholds
 2020-06-05 12:16:34 +09:30
Chris
c99deae9cc Add some sanity checking around tile object sizes 2020-06-05 12:16:24 +09:30
moisterrific
911f0d9320
Add additional onXthresholdBroken to changelog 
sorry I couldn't figure out how to put everything in one pr
 2020-06-04 22:39:52 -04:00
Chris
5e3f70382d
Merge branch 'general-devel' into patch-13 2020-06-05 12:09:14 +09:30