Commit graph

359 commits

Author SHA1 Message Date
xuyuwtu
75c8a8ced4 Use better code 2026-01-29 13:50:09 +08:00
xuyuwtu
f81debe879 kick Added buff msg add Type 2026-01-28 22:08:52 +08:00
Cai
9eb49b0447
sync 2026-01-28 14:13:30 +08:00
Chris
fde4114be8
Merge branch 'general-devel' into general-devel 2026-01-18 16:07:07 +10:30
Chris
5dcffe52e4
Merge branch 'general-devel' into general-devel 2026-01-18 15:52:12 +10:30
Chris
4ad64ff5c9
Merge branch 'general-devel' into fix-portal-rangecheck 2026-01-18 15:52:09 +10:30
ACaiCat
2ac52cb146 fix(Bouncer): correct debug message of portal gun bolt validation 2025-07-22 19:07:25 +08:00
ACaiCat
9de7ce6957 fix(Bouncer): remove holding a Portal Gun check
* Portal Gun Station also shoot Portal Gun Bolt
2025-07-22 19:03:44 +08:00
ACaiCat
539d8194b4 fix(Bouncer): remove portal bolt position validation 2025-07-22 14:26:34 +08:00
ACaiCat
8f596968e1 feat(Bouncer): add portal validation to block portal exploit
Co-authored-by: LaoSparrow <laosparrow@outlook.com>
Co-authored-by: RuyouSunshine <221790696+RuyouSunshine@users.noreply.github.com>
Co-authored-by: 肝帝熙恩 <111548550+thexn@users.noreply.github.com>
2025-07-22 12:59:46 +08:00
Cai
899e02c36a fix(Bouncer): fix bounds checking in OnPlayerPortalTeleport (#3127) 2025-06-22 08:39:13 +08:00
Cai
0b79a6bee4 refactor(Bouncer): remove RangeCheck for ChestOnQuickStack operations and rename method
Players are not able to quick-stack items into out-of-range chests.
2025-06-17 06:44:28 +08:00
Cai
6c500dfa70 fix(Bouncer): players bypass region protection and build permissions when using Quick Stack 2025-06-16 09:05:22 +08:00
Lucas Nicodemus
0e22e2068a
Merge branch 'general-devel' into general-devel 2025-05-14 19:53:18 +09:00
Cai
7db908195f fix(OnTileEdit): item disappeared when hitting an ItemFrame without permission 2025-05-11 12:00:42 +08:00
Nightklp
43daa67465
Update TShockAPI/Bouncer.cs
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
2025-04-04 12:49:31 +08:00
Nightklp
3af71c70fe
Update TShockAPI/Bouncer.cs
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
2025-04-04 12:48:09 +08:00
Nightklp
f814d568e5
Update Bouncer.cs
return a item when a item frame was interacted in protected region you do not have permission with
2025-04-03 16:21:57 +08:00
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