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

5698 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Puleo
f2e52d97de
Allow the Axe of Regrowth and the Rubblemaker to pass Bouncer checks 
The Axe of Regrowth will place a `Saplings` tile object where a tree
used to be, whilst it's `createItem` does not match that of a sapling.
Added an exception to allow this interaction to succeed.

The Rubblemaker is allowed to place echo piles, which will not match
the `createTile` or `placeStyle` of the created piles (except in one
very specific case, I suppose). Added an exception to allow this
interaction to succeed.

The check for the `style` of the placement to match that of
`SelectedItem` was moved to be later on, after checking the tile type,
and only if the two exceptions above weren't triggered. It will also now
sync the tiles upon failure.
 2022-10-10 09:16:16 -04:00
James Puleo
b3a6495eba
Always allow breaking of tiles that are in BreakableWhenPlacing set 
These tiles (usually piles) might get destroyed even without a pickaxe,
as result of another placement about to happen.
 2022-10-10 09:13:39 -04:00
Lucas Nicodemus
d3f542cf03
Merge pull request #2709 from Pryaxis/renovate/otapi-things 
Update OTAPI things
 2022-10-09 11:34:55 -07:00
renovate[bot]
69007832d3
Update OTAPI things 2022-10-09 18:29:13 +00:00
Lucas Nicodemus
004ff63899
Merge remote-tracking branch 'drunderscore/fix/new-add-buffs-to-npc' into general-devel 2022-10-09 00:36:52 -07:00
Lucas Nicodemus
b38b1d0b3c
Merge pull request #2706 from PotatoCider/general-devel 
Update Github CI to not tarball artifacts for Windows only
 2022-10-08 21:20:10 -07:00
Joseph Goh
bc4c337d66
Update changelog 2022-10-09 12:04:30 +08:00
Joseph Goh
bf90131558
zip artifacts only for windows builds 2022-10-09 11:59:46 +08:00
Lucas Nicodemus
938de04b52
Update to OTAPI 3.1.10-alpha; support FreeBSD 2022-10-08 17:06:09 -07:00
Lucas Nicodemus
605b724f58
Merge pull request #2705 from Pryaxis/renovate/otapi-things 
Update dependency OTAPI.Upcoming to v3.1.10-alpha
 2022-10-08 16:43:03 -07:00
renovate[bot]
92ba036bb9
Update dependency OTAPI.Upcoming to v3.1.10-alpha 2022-10-08 23:23:49 +00:00
Lucas Nicodemus
590616b432
Tweak changelog entry to conform to precedent 2022-10-08 12:51:04 -07:00
Lucas Nicodemus
70d22111b2
Merge remote-tracking branch 'hufang360/general-devel' into general-devel 2022-10-08 12:50:11 -07:00
Lucas Nicodemus
20964a0e8c
Tick version to 5.0.0-beta.0.1 2022-10-08 11:18:00 -07:00
hufang360
678f18b827
Update GetDataHandlers.cs 
Correct the mistakes caused by my carelessness.
 2022-10-09 01:35:45 +08:00
James Puleo
b34bfbd605
Update CHANGELOG.md with PlayerAddBuff Bouncer changes 2022-10-08 13:09:56 -04:00
James Puleo
23fd7acd79
Improve OnPlayerBuff logic to properly handle buffs from other players 
Previously, we checked if the target player was null, before checking if
their ID was out of bounds, so the check was moved to be first.
We now check if the buff being applied is within bounds.

We introduce `AddPlayerBuffWhitelist` to replace `WhitelistBuffMaxTime`,
which allows us to specify a maximum amount of ticks a buff can be
applied to another player for, and if it can be applied without the
target being in PvP. If a buff is not within this array, it is *not*
allowed to be applied by other players.

When rejecting from `OnPlayerBuff`, we send a `PlayerBuff` instead of
`PlayerAddBuff`, to sync the current buffs of the target, without
syncing the rejected one.
 2022-10-08 13:09:54 -04:00
James Puleo
16d48a4a56
Fixed HandlePlayerAddBuff data handler always being marked as Handled 
This would cause all `PlayerAddBuff` packets to always be rejected,
causing desync, and general annoyance, as it meant any PvP items that
applied buffs never worked.
 2022-10-08 11:54:43 -04:00
James Puleo
daff675844
Update CHANGELOD.md 2022-10-08 11:07:51 -04:00
James Puleo
c1edbea1a2
Allow Blood Butcherer and Shimmer buffs to be applied to NPCs by players 2022-10-08 11:07:49 -04:00
hufang360
66379a4a17 Fix player does't use the Shellphone (Ocean), Shellphone (Underworld) and Shellphone (Spawn). 2022-10-08 22:50:28 +08:00
Lucas Nicodemus
0c37b0fed3
Reorder changelog entries from 83427106a5 2022-10-07 20:44:32 -07:00
Lucas Nicodemus
83427106a5
Merge remote-tracking branch 'punchready/general-devel' into general-devel 2022-10-07 20:41:46 -07:00
Lucas Nicodemus
ae578ce184
Merge remote-tracking branch 'tbc/fix/paint-rejects' into general-devel 2022-10-07 20:40:17 -07:00
Lucas Nicodemus
62eb0afb18
Merge remote-tracking branch 'drunderscore/feature/bounce-some-new-packets' into general-devel 2022-10-07 20:38:42 -07:00
Lucas Nicodemus
57e7ee86fa
Merge pull request #2700 from Pryaxis/renovate/otapi-things 
Update dependency OTAPI.Upcoming to v3.1.9-alpha
 2022-10-07 17:23:36 -07:00
Lucas Nicodemus
50e6a1dffe
Merge branch 'general-devel' into renovate/otapi-things 2022-10-07 17:18:01 -07:00
Lucas Nicodemus
5d681d21b8
Update TSAPI for 1.4.4.5 2022-10-07 17:17:40 -07:00
renovate[bot]
82008437c2
Update dependency OTAPI.Upcoming to v3.1.9-alpha 2022-10-08 00:04:50 +00:00
Chris
a2245b210a
Merge pull request #2697 from Pryaxis/banondeath 
Fix hard/mediumcore ban on death when settings are enabled.
 2022-10-07 19:35:07 +10:30
Luke
43a5b1d513 Merge branch 'general-devel' into banondeath 2022-10-07 18:52:35 +10:00
Lucas Nicodemus
c875168640
Merge pull request #2688 from Pryaxis/dependency_base_path 
Fix #2674 - Change the use of current directory to match the server a…
 2022-10-07 01:47:52 -07:00
Lucas Nicodemus
06a631af7e
Merge branch 'general-devel' into dependency_base_path 2022-10-07 01:43:49 -07:00
Luke
22239c7966 Update CHANGELOG.md 2022-10-07 18:43:12 +10:00
Luke
d6caeb15cc Fix hard/mediumcore ban on death 
Removed the force parameter since it is of no use.
 2022-10-07 18:42:31 +10:00
Luke
701d00f473 Update CHANGELOG.md 2022-10-07 18:21:14 +10:00
Lucas Nicodemus
3d7ba2b2d5
Merge pull request #2696 from Pryaxis/renovate/otapi-things 
Update TerrariaServerAPI digest to de9e3c7
 2022-10-07 00:07:54 -07:00
renovate[bot]
3dc5b8a288
Update TerrariaServerAPI digest to de9e3c7 2022-10-07 06:57:55 +00:00
Lucas Nicodemus
bc6b31dbcb
Merge pull request #2694 from Pryaxis/renovate/actions-upload-artifact-3.x 
Update actions/upload-artifact action to v3
 2022-10-06 11:03:07 -07:00
renovate[bot]
d12a6a61c0
Update actions/upload-artifact action to v3 2022-10-06 17:56:57 +00:00
Lucas Nicodemus
2c1c3f5d4c
Merge pull request #2691 from Pryaxis/renovate/vstest-monorepo 
Update dependency Microsoft.NET.Test.Sdk to v17.3.2
 2022-10-06 10:56:38 -07:00
renovate[bot]
ee8fe1abef
Update dependency Microsoft.NET.Test.Sdk to v17.3.2 2022-10-06 16:59:36 +00:00
Lucas Nicodemus
bfcedad9b4
Merge pull request #2693 from Pryaxis/renovate/actions-setup-dotnet-3.x 
Update actions/setup-dotnet action to v3
 2022-10-06 09:59:20 -07:00
renovate[bot]
3d1f7e6e1f
Update actions/setup-dotnet action to v3 2022-10-06 16:36:37 +00:00
Lucas Nicodemus
5ff50cf8c8
Merge pull request #2690 from Pryaxis/renovate/dotnet-monorepo 
Update dependency Microsoft.Data.Sqlite to v6.0.9
 2022-10-06 09:36:15 -07:00
James Puleo
cd694af73f
Update CHANGELOG.md 2022-10-06 12:24:52 -04:00
James Puleo
40b07fdc7b
Don't allow players to sync loadout index whilst disabled 2022-10-06 12:24:09 -04:00
renovate[bot]
dd54f11c73
Update dependency Microsoft.Data.Sqlite to v6.0.9 2022-10-06 16:22:58 +00:00
Lucas Nicodemus
4382cd8086
Merge pull request #2692 from Pryaxis/renovate/actions-checkout-3.x 
Update actions/checkout action to v3
 2022-10-06 09:22:40 -07:00
renovate[bot]
c853d68be0
Update actions/checkout action to v3 2022-10-06 16:07:49 +00:00