Commit graph

4836 commits

Author SHA1 Message Date
Patrikkk
69f232b12a Adding DisplayDollItemSync event.
An event that is called when a player modifies the slot of a DisplayDoll (Mannequin).

I was trying to think from a developer friendly perspective here.
Instead of passing seperate variables for type/stack/prefix, thought I pass an Item object.
As well as, instead of having devs who work with this hook figure out and implement how to get the Item of the DisplayDoll, I just provide it in the hook.
I can imagine this being used for creative purposes in plugins.
2020-06-19 14:07:39 +02:00
Patrikkk
1807488f2f
Merge pull request #2058 from Rustly/general-devel
Fix snake charmer's flute and block npc spawnrate change permission error on join
2020-06-18 23:57:20 +02:00
Rustly
0a01ae6d83
Merge branch 'general-devel' into general-devel 2020-06-18 16:53:14 -05:00
Rustly
c51f8abcbf
totally didnt update changelog again 2020-06-18 16:51:18 -05:00
Rustly
ce953c6eaa
forgot github is funny with line breaks 2020-06-18 16:48:56 -05:00
Rustly
b454d3fcb7 Update CHANGELOG.md 2020-06-18 16:46:20 -05:00
Patrikkk
5a494b993a
Merge pull request #2053 from Pryaxis/removebouldercheck
Bouncer OnTileEdit - Remove redundant Boulder placement check
2020-06-18 16:20:19 +02:00
Patrikkk
b19e95b99d
Merge branch 'general-devel' into removebouldercheck 2020-06-18 16:09:21 +02:00
Patrikkk
698b3937aa
Merge pull request #2054 from moisterrific/patch-19
Add clarity to !HasPermission error messages
2020-06-18 16:03:38 +02:00
Rustly
2f22271dbe Update CHANGELOG.md 2020-06-15 13:33:56 -05: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
b831832fed
Improved clarity for !HasPermission error msg 2020-06-13 13:17:24 -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
35a3125891
Merge pull request #2043 from Pryaxis/ontileeditcleanup
Bouncer OnTileEdit - Code cleanup
2020-06-13 12:17:43 +02:00
Patrikkk
a80e88b85b
Merge branch 'general-devel' into ontileeditcleanup 2020-06-13 12:13:20 +02:00
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
e2fad8e77e
Merge branch 'general-devel' into ontileeditcleanup 2020-06-12 14:28:48 +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
d4d2fef49e Update CHANGELOG. Tag user who made the change. 2020-06-12 10:33:59 +02:00
Patrikkk
e305f10d61 Update CHANGELOG.md 2020-06-12 10:32:49 +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
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