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

4062 commits

Author SHA1 Message Date
Lucas Nicodemus
15077dbccc
Version tick: 5.0.0-beta.0.5 2022-10-17 01:52:20 -07:00
Lucas Nicodemus
20fb5023c1
Merge remote-tracking branch 'drunderscore/fix/add-player-buff' into general-devel 2022-10-14 23:49:15 -07:00
Lucas Nicodemus
368b0b274c
Merge remote-tracking branch 'drunderscore/fix/new-tile-placements' into general-devel 2022-10-14 23:37:18 -07:00
Lucas Nicodemus
9258ee77d4
Merge remote-tracking branch 'drunderscore/fix/bunny-cannon-quick-action' into general-devel 2022-10-14 23:31:44 -07:00
Lucas Nicodemus
882ecef013
Merge remote-tracking branch 'drunderscore/fix/bottomless-honey-bucket-is-real' into general-devel 2022-10-14 23:27:07 -07:00
Lucas Nicodemus
da6a134609
Merge remote-tracking branch 'packmandude/general-devel' into general-devel 2022-10-14 23:19:40 -07:00
Lucas Nicodemus
2bc7541fb5
Merge remote-tracking branch 'origin/renovate/dotnet-monorepo' into general-devel 2022-10-14 23:17:02 -07:00
Lucas Nicodemus
2804f71eb0
Merge remote-tracking branch 'drunderscore/fix/you-cant-have-a-pie-without-cool-whip' into general-devel 2022-10-14 23:16:17 -07:00
Lucas Nicodemus
980ceeb4a1
Merge remote-tracking branch 'stealownz/fix/inferno-fork-onnpcaddbuff-kick' into general-devel 2022-10-14 23:10:45 -07:00
James Puleo
0f3f5d8652
Allow the Cool Whip to apply CoolWhipNPCDebuff buff for 240 ticks 2022-10-14 12:09:38 -04:00
renovate[bot]
44ae34f06e
Update dependency Microsoft.Data.Sqlite to v6.0.10 2022-10-13 05:53:52 +00:00
renovate[bot]
8bff6edfdc
Update dependency MySql.Data to v8.0.31 2022-10-13 05:44:50 +00:00
Luke
a7cd6b6c9c Update ITile with new NetTile data 2022-10-12 16:51:31 +10:00
Luke
818f5fcc59 Read/write new NetTile data 2022-10-12 16:38:15 +10:00
Stealownz
29d08dd606 Fix Inferno Fork's OnFire debuff causing Bouncer reject abnormal buff 
Inferno Fork's OnFire debuff was buffed up to `60 * Main.rand.Next(8, 16)`
 2022-10-11 22:15:30 +08:00
James Puleo
1df123d2be
Make Bouncer reject Shimmer placement without bucket or whilst banned 2022-10-10 19:00:43 -04:00
James Puleo
bf53c3313c
Make Bouncer allow Bottomless Honey Buckets 2022-10-10 18:59:54 -04:00
James Puleo
4189b4ab1f
Add LiquidType.Shimmer 2022-10-10 18:55:39 -04:00
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
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
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
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
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
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
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
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
Armano den Boef
b49810ae06
Merge branch 'general-devel' into fix/paint-rejects 2022-10-06 12:09:20 +02:00
Arthri
c313b0733e Remove obsolete resources 2022-10-06 13:23:46 +08:00
Rozen
d1505127dd
Revert accidental removal of OnPaintTile check 2022-10-05 21:59:49 +02:00
Rozen
62d35533a0
Init 2022-10-05 21:58:09 +02:00
James Puleo
aa17f013c1
Use a string interpolation and escape single quotes when escaping tables 2022-10-05 13:57:30 -04:00
Luke
02b8061531 Change nuget package name to tshock instead of tshockapi 2022-10-05 19:36:13 +10:00
Luke
9fb8320d60
Update TShockAPI/TShockAPI.csproj 
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
 2022-10-04 16:07:22 +10:00
Luke
f87fa90e65 Nuget package information and workflow 2022-09-10 09:07:13 +10:00
Luke
5a98add6de Fix sqlite null parameters + unit test 2022-09-08 16:08:16 +10:00
Luke
67b06f5e4f Improve ReduceConsoleSpam module to filter world generation 2022-09-06 23:06:39 +10:00
Luke
aa0bd7deb2 Merge branch 'general-devel' into otapi3 2022-09-06 22:23:34 +10:00
Luke
99ddcb247b Dependency updates, OTAPI 3.1 & ModFw 1.1 2022-09-05 22:01:33 +10:00
Lucas Nicodemus
1d4d19f961 Version tick: 4.5.18 
And also, add changelog entry for dependabot change
 2022-08-16 20:57:26 -07:00
Lucas Nicodemus
bbc8ef2dab Merge branch 'h/punchready-fixes' into general-devel 2022-08-16 20:52:21 -07:00
Lucas Nicodemus
9a746a079b
Merge pull request #2632 from Pryaxis/dependabot/nuget/TShockAPI/Newtonsoft.Json-13.0.1 
Bump Newtonsoft.Json from 10.0.3 to 13.0.1 in /TShockAPI
 2022-08-16 20:49:50 -07:00
Lucas Nicodemus
39383c9fff Merge remote-tracking branch 'punchfix/h/a-new-branch' into h/punchready-fixes 2022-08-16 20:47:21 -07:00