SGKoishi
413a2b91e3
Fix Pryaxis/TShock#3073
2025-03-18 17:17:45 +09:00
Arthri
2053213558
Bounce infinite or NaN velocity / position
2025-02-08 07:13:03 +00:00
SGKoishi
65559d5db8
Merge remote-tracking branch 'upstream/general-devel' into pr3005
2025-01-26 01:22:34 +09:00
Lucas Nicodemus
a42046e79c
Merge branch 'general-devel' into consistency-playeractive-patch
2025-01-25 23:03:30 +09:00
Arthri
5c4db00f1e
Fix Cursed Flare
2024-04-24 06:01:04 +00:00
SGKoishi
dbca317639
Update CursedInferno time limit
2023-12-27 13:01:55 -08:00
SGKoishi
cf726368c5
Use seconds as the time unit
2023-12-22 13:19:58 -08:00
SGKoishi
3c2a3f3e53
Add unstaged changes
2023-12-21 20:43:41 -08:00
SGKoishi
b6041a738e
Whitelist the Striking Moment (ParryDamageBuff) buff
2023-12-21 20:40:01 -08:00
Stargazing Koishi
f1b67f8602
Merge branch 'general-devel' into consistency-playeractive-patch
2023-04-28 15:53:43 -07:00
James Puleo
7b7de04a7f
Relax custom death message restrictions to allow Inferno potions in PvP
...
For some reason, Inferno potions do PvP damage without specifying the
source player in the `PlayerDeathReason` -- so special-case the only
identifying information being the other index value of `16`.
2023-03-13 02:15:04 -04:00
SGKoishi
59f9440d17
Use same TSPlayer.Active check
2022-12-12 17:15:34 -08:00
Lucas Nicodemus
2606805073
Merge remote-tracking branch 'drunderscore/fix/whitelist-more-buffs' into general-devel
2022-12-05 21:40:10 -08:00
James Puleo
88c639c115
Whitelist the Mighty Wind (WindPushed) buff
...
This is applied by sandstorm events.
2022-12-02 13:24:04 -05:00
James Puleo
ae3c9654ad
Increase whitelisted duration of the Hellfire (OnFire3) buff
...
From 5 seconds to 6 seconds, as the Brand of the Inferno will apply this
buff for a maximum of 6 seconds.
2022-12-02 13:23:34 -05:00
SGKoishi
fa08859952
Group checks by item type instead of liquid type
2022-11-28 00:57:53 -08:00
SGKoishi
49921cb7ed
Move permission check together
2022-11-28 00:56:02 -08:00
SGKoishi
ac7ee7e706
Extract common condition
2022-11-28 00:50:45 -08:00
SGKoishi
62e6aaa826
Use single reject to reduce code
2022-11-28 00:49:46 -08:00
SGKoishi
35d47fdf6a
Remove bucket magic number
2022-11-28 00:44:45 -08:00
SGKoishi
baeb5a2f20
Fixed Super Sponge unable to absorb shimmer
2022-11-28 00:41:45 -08:00
Lucas Nicodemus
10268bb196
Merge remote-tracking branch 'sgk/bombfix' into general-devel
2022-11-27 23:49:16 -08:00
James Puleo
51de32387a
Improve rejection message and code duplication in OnPlayerBuff
...
There is now a local function `Reject` that will handle logging,
rejecting, and (optionally) re-syncing upon a rejected packet.
Alongside this, the debug message has been improved to include the
sender index, buff type, receiver index, and the time in ticks (and the
existing reason for rejection.)
2022-11-26 21:14:30 -05:00
James Puleo
71a480af6b
Whitelist Shadow Candle and BoC for PlayerAddBuff
2022-11-26 21:14:28 -05:00
SGKoishi
3c6521caff
Fix Digging Molecart and Bomb Fish blocked
2022-11-20 12:27:14 -08:00
Lucas Nicodemus
01917d48ed
Merge remote-tracking branch 'sgk/pr2811' into general-devel
2022-11-09 23:20:19 -08:00
Lucas Nicodemus
a9aa988547
Merge remote-tracking branch 'sgk/patch-morei18n' into general-devel
2022-11-09 23:08:34 -08:00
Lucas Nicodemus
b322c4c1e0
Replace references to Main.max*whatever*count
...
All of the Main.maxwhatever fields have been replaced with
Terraria.ID.WhateverID.Count fields.
2022-11-09 22:53:29 -08:00
SGKoishi
bd70495774
Allow Torch God's Facor to place biome torch and campfire
2022-11-06 11:45:02 -08:00
SGKoishi
770b177426
Rewording update
2022-11-04 20:40:07 -07:00
SGKoishi
fde43a7730
More i18n
...
Strings for player kick/ban, anti-cheating and server logs
2022-11-02 13:42:52 -07:00
SGKoishi
65e93b7c17
Show buff time in the log
2022-10-31 14:33:05 -07:00
Lucas Nicodemus
eae8ae1fb5
Merge branch 'general-devel' into patch-3
2022-10-27 15:49:53 -06:00
SGKoishi
4f6ba61611
Fix several bracket mismatch
2022-10-27 01:53:41 -07:00
yuyu
4621a2f7f5
Update Bouncer / OnNPCAddBuff
2022-10-26 22:17:25 +08:00
SGKoishi
b766e045b5
Use i18n for most string.Format if shown in log, console or client side
2022-10-24 13:38:33 -07:00
BashGuy10
8818885a9e
Fix being kicked for using the new sponge types
2022-10-22 20:52:33 -07:00
BashGuy10
309f4e5500
Fix flamethrowers kicking players
2022-10-22 17:28:16 -07:00
Janet Blackquill
f63b26ac76
Some i18nifiying
2022-10-21 16:12:04 -04: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
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
James Puleo
0f3f5d8652
Allow the Cool Whip to apply CoolWhipNPCDebuff buff for 240 ticks
2022-10-14 12:09:38 -04: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
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
