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

4171 commits

Author SHA1 Message Date
Stargazing Koishi
104598394b
Merge branch 'general-devel' into tileconv 2022-12-10 21:37:52 +00:00
SGKoishi
656a6a49be
Exclude unused fields, allow tileMoss, SandSpray and SnowSpray 2022-12-10 13:36:13 -08:00
James Puleo
794bff5ef7
Initialize achievements and the AchievementManager on the server 
The `AchievementTagHandler` expects `Main.Achievements` to be non-null,
which is not normally the case on dedicated servers. When trying to
parse an achievement chat tag, it will instead throw.

The tag is parsed when calling `ChatManager.ParseMessage`, which is used
in TShock when writing chat messages to the console. Our `OnChat`
handler uses `Utils.Broadcast`, which will send the message to all
connected clients, write the message to the console and the log. Due to
the order of execution, the message ends up being sent to all connected
clients, but throws whilst trying to write to the console, and never
gets written to the log.

To solve the issue, we make achievements available on the server,
allowing the tag handler to work as expected, and even allowing the
localization of achievements names to appear in the console.
 2022-12-05 23:24:58 -08:00
ATFGK
e46bbe99c0
Pvp with no team (#2851) 
* Update TShockConfig.cs

* Update TShock.cs

* Update GetDataHandlers.cs

* Update changelog.md

* Update GetDataHandlers.cs

* Update changelog.md

* Update changelog.md

* Update changelog.md
 2022-12-05 22:27:42 -08:00
ATFGK
95d157fd5d
Fix Terra Blade triggered MaxProjDamage, other net changes (#2852) 
* update

* update

* update

* Update changelog.md

* Update changelog.md

Fixed syntax errors.

* Update SpawnMsg.cs

Use insteadUpperCamelCase

* Update changelog.md

* Update TSPlayer.cs

* Update TSPlayer.cs

Missing letters due to input method problems.

* Update `docs/changelog.md`

Co-authored-by: James Puleo <james@jame.xyz>
 2022-12-05 21:45:37 -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
Lucas Nicodemus
d0262656df
Merge remote-tracking branch 'origin/config/WorldTileProvider' into general-devel 2022-11-27 23:46:18 -08:00
Lucas Nicodemus
bf06a17c19
Merge remote-tracking branch 'drunderscore/fix/more-add-player-buff-whitelists' into general-devel 2022-11-27 23:44:31 -08:00
SGKoishi
b57d02094f
Fix Utils.GetByName add duplicate candidate for same target i18n 2022-11-27 22:30:40 -08:00
SGKoishi
d2037a62e5
Allow more tile and wall conversion 2022-11-27 21:14:13 -08:00
Luke
b24fd4fe43 Merge remote-tracking branch 'upstream/general-devel' into config/WorldTileProvider 2022-11-27 15:16:32 +10: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
Lucas Nicodemus
e498d6685b
Merge branch 'general-devel' into patch-buffnpc-i18nconsistency 2022-11-26 20:38:09 -05:00
Lucas Nicodemus
6421c7623a
Version tick: 5.1.3 2022-11-24 23:58:45 -07:00
SGKoishi
3c6521caff
Fix Digging Molecart and Bomb Fish blocked 2022-11-20 12:27:14 -08:00
Stargazing Koishi
d236653559
Merge branch 'general-devel' into patch-buffnpc-i18nconsistency 2022-11-11 18:58:00 -08:00
Luke
b8afcd874d Add ToLower to WorldTileProvider switch 
Allows "room for error in capitalization" as per review discussion.
 2022-11-12 10:03:42 +10:00
Luke
0f46b1255a Add WorldTileProvider to tshock config 
This allows the tshock tile providers to be switched via the config instead of cli args via tsapi, for environments where the command line args cannot be changed.
 2022-11-12 07:28:26 +10:00
Lucas Nicodemus
c8cb747c57
Version tick: 5.1.2 2022-11-10 14:15:20 -08:00
Stargazing Koishi
7a49d61761
Merge branch 'Pryaxis:general-devel' into patch-buffnpc-i18nconsistency 2022-11-10 02:23:30 -08:00
Lucas Nicodemus
3ad573855b
Version tick 5.1.1 2022-11-10 00:46:05 -08:00
Lucas Nicodemus
15c8bf8436
Fix bug from i18nification 
Wrong paren match
 2022-11-10 00:25:45 -08:00
Stargazing Koishi
1db4e5e20b
Merge branch 'general-devel' into patch-buffnpc-i18nconsistency 2022-11-10 00:13:35 -08:00
SGKoishi
2f1420faef
Update 1.4.4.8 2022-11-10 00:10:38 -08:00
SGKoishi
fb96d8b0c8
Merge upstream 2022-11-10 00:09:40 -08:00
Lucas Nicodemus
ea96b3dc70
Version tick: 5.1.0 2022-11-10 00:09:39 -08:00
Lucas Nicodemus
09b1e86c0c
Fix build due to outdated PR merge lol 2022-11-09 23:24:39 -08:00
Lucas Nicodemus
01917d48ed
Merge remote-tracking branch 'sgk/pr2811' into general-devel 2022-11-09 23:20:19 -08:00
James Puleo
ad9c9cccce
Properly remove all buffs in PlayerData.RestoreCharacter 
This was previously using the constant `22` directly, instead of
`Player.maxBuffs`, which is now `44`. This theoretically allowed players
to smuggle buffs on to servers with SSC enabled, by using buff indexes
past `22`.
 2022-11-09 23:18:03 -08:00
James Puleo
5a72121200
Only restrict CC'd players during login whilst SSC is enabled 
The player being CC'd does not cause any issues for us if SSC isn't
enabled, so we can relax it's restriction.

This also allows the `RequireLogin` config option to function usefully
again, as it would disable the player, causing them to be CC'd until
they logged in, creating a vicious cycle.
 2022-11-09 23:18:03 -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
ea6a128759
Merge remote-tracking branch 'sgk/pr2808' into general-devel 2022-11-09 23:05:50 -08:00
renovate[bot]
4a7971519d
Update dependency Microsoft.Data.Sqlite to v6.0.11 2022-11-10 07:02:44 +00: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
34886864ec
Update HandleSpawnBoss 
Apply permission restriction to Mechdusa, Deerclops, and slime pet
 2022-11-07 11:42:26 -08:00
Stargazing Koishi
51a8ee8672
Merge branch 'general-devel' into pr2811 2022-11-07 11:38:21 -08:00
Lucas Nicodemus
842f8c0108
Merge remote-tracking branch 'drunderscore/fix/allow-surly-slime-to-be-fished' into general-devel 2022-11-06 23:03:48 -08:00
SGKoishi
bd70495774
Allow Torch God's Facor to place biome torch and campfire 2022-11-06 11:45:02 -08:00
SGKoishi
863d51ad27
Add missing string 2022-11-04 20:46:53 -07:00
SGKoishi
770b177426
Rewording update 2022-11-04 20:40:07 -07:00