Commit graph

5975 commits

Author SHA1 Message Date
AkjaHAsLk1IALk0MasH
763519150a Updated the PlayerData.StoreSlot method
Removed the ability to call a method when a slot less than 0 is specified.

Added an overload that takes `NetItem` in parameters.
2023-05-14 10:33:54 +07:00
AkjaHAsLk1IALk0MasH
2e8823434c Updated the PlayerData constructors.
Added a new constructor with a parameter that is responsible for installing TShock items into inventory.

The `TSPlayer` parameter was not used, so I labeled the constructor obsolete.
2023-05-14 10:30:52 +07:00
Lucas Nicodemus
c67d5cf152
Version tick: 5.2 2023-05-10 01:51:05 -04:00
Chris
2c06e2bdf5
Merge pull request #2892 from hufang360/patch-1
Update Utils.cs
2023-03-26 15:36:20 +10:30
Chris
9231b7d296
Merge branch 'general-devel' into patch-1 2023-03-25 17:22:09 +10:30
Chris
01b8e521f7
Merge pull request #2933 from punchready/patch-2
Update STR handling to reject for-sure invalid framing values
2023-03-25 16:52:51 +10:30
Chris
ec72f4957b
Merge branch 'general-devel' into patch-2 2023-03-25 16:45:45 +10:30
Chris
9e9996f902
Merge pull request #2888 from bcat/quickstack-rm-rangecheck
Remove unnecessary range check for quick stack
2023-03-25 16:45:13 +10:30
Chris
df04c81384
Merge branch 'general-devel' into quickstack-rm-rangecheck 2023-03-25 15:34:55 +10:30
Chris
20bb8c4eb5
Merge pull request #2894 from sgkoishi/saveonlyafterjoin
Add a check to InsertPlayerData to prevent data overwrite
2023-03-25 15:34:22 +10:30
Chris
ddc9d776fc
Merge branch 'general-devel' into saveonlyafterjoin 2023-03-25 15:20:32 +10:30
Chris
00a27d3c4c
Merge pull request #2920 from punchready/patch-1
Update definitions for Flower Boots to allow Ash Plants
2023-03-25 15:19:48 +10:30
Chris
a90791db84
Merge branch 'general-devel' into patch-1 2023-03-25 15:15:05 +10:30
Chris
f0c3f51ac7
Merge branch 'general-devel' into saveonlyafterjoin 2023-03-25 15:14:34 +10:30
Chris
4daf093f07
Merge branch 'general-devel' into patch-1 2023-03-25 15:12:28 +10:30
Chris
91c37fa53b
Merge pull request #2932 from drunderscore/fix/inferno-potions-are-wack
Relax custom death message restrictions to allow Inferno potions in PvP
2023-03-25 15:08:26 +10:30
punchready
3f55a86589 Update changelog 2023-03-24 21:40:31 +01:00
punchready
5acc3afcb6 Update STR handling to reject for-sure invalid framing values 2023-03-24 21:39:24 +01:00
James Puleo
359fe8caf8
Update docs/changelog.md 2023-03-13 02:15:41 -04: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
Jonathan Rascher
b833e48526 Remove unnecessary range check for quick stack 2023-03-09 21:55:52 -06:00
Lucas Nicodemus
69569a5be5
Added obvious warning about spamming github to code of conduct 2023-03-10 10:37:15 +09:00
punchready
defbe5c34f
Update changelog 2023-02-28 22:09:36 +01:00
punchready
9a0269fb83
Update definitions for Flower Boots to allow Ash Plants 2023-02-28 22:05:25 +01:00
Cardinal System
510d696f16
New Crowdin updates (#2886)
* New translations template.pot (Portuguese, Brazilian)
[skip actions]

* New translations template.pot (Portuguese, Brazilian)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Turkish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Spanish)
[skip actions]
2023-02-05 14:07:24 -08:00
Chris
07f173e698
Merge pull request #2909 from drunderscore/fix/pass-player-through-to-sync-tile-picking
Set the `GetDataHandledEventArgs.Player` property for the `SyncTilePicking` data handler
2023-02-03 20:55:56 +10:30
James Puleo
3f4dd7b4b5
Update docs/changelog.md 2023-01-29 20:53:26 -05:00
James Puleo
f7ea471968
Set the GetDataHandledEventArgs.Player property for pick sync handler 2023-01-29 20:50:36 -05:00
Stargazing Koishi
fc4c509285
Add a check to InsertPlayerData to prevent data overwrite 2023-01-11 02:23:01 -08:00
hufang360
2f7a807201
Update Utils.cs
Item stack can be 9999.
2023-01-09 10:56:17 +08:00
Lucas Nicodemus
6e589ffaee
Merge remote-tracking branch 'atfgk/Fixed-startup-error' into general-devel 2022-12-12 23:47:57 -08:00
ATFGK
1435066745
Update Program.cs 2022-12-13 12:05:44 +08:00
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
Cardinal System
c6b60e22d7
New translations template.pot (Chinese Simplified) (#2867)
[skip actions]
2022-12-06 09:56:48 -08:00
James Puleo
24bb002e64
Update docs/changelog.md 2022-12-05 23:24:58 -08:00
James Puleo
205c29bc88
Add tests for parsing achievement tags in chat
These tests ensure that `ChatManager.ParseMessage` will not throw on the
server with TShock when given an achievement tag.
2022-12-05 23:24:58 -08:00
James Puleo
d0554abd46
Allow multiple test cases in the TShock test suite
Previously, we were initializing TShock before each test. This isn't
actually what we want to do, because NUnit will (by default) execute all
tests within one instance. Initializing TShock multiple times would
cause issues, so let's just do it once at the very beginning, before any
tests execute.
2022-12-05 23:24:58 -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
Cardinal System
84c59b98eb
New Crowdin updates (#2865)
* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Turkish)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (French)
[skip actions]

* New translations template.pot (German)
[skip actions]

* New translations template.pot (Italian)
[skip actions]

* New translations template.pot (Japanese)
[skip actions]

* New translations template.pot (Polish)
[skip actions]

* New translations template.pot (Portuguese)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Portuguese, Brazilian)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Pirate English)
[skip actions]

* New translations template.pot (French, Quebec)
[skip actions]

* New translations template.pot (Russian, Ukraine)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]
2022-12-05 22:27:54 -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
Cardinal System
825ff2ad9e
Update translation template 2022-12-06 05:43:50 +00:00
Cardinal System
e3a48d3069
New Crowdin updates (#2853)
* New translations template.pot (Spanish)
[skip actions]

* New translations template.pot (Turkish)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (French)
[skip actions]

* New translations template.pot (German)
[skip actions]

* New translations template.pot (Italian)
[skip actions]

* New translations template.pot (Japanese)
[skip actions]

* New translations template.pot (Polish)
[skip actions]

* New translations template.pot (Portuguese)
[skip actions]

* New translations template.pot (Russian)
[skip actions]

* New translations template.pot (Portuguese, Brazilian)
[skip actions]

* New translations template.pot (Indonesian)
[skip actions]

* New translations template.pot (Pirate English)
[skip actions]

* New translations template.pot (French, Quebec)
[skip actions]

* New translations template.pot (Russian, Ukraine)
[skip actions]

* New translations template.pot (toki pona)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Chinese Simplified)
[skip actions]

* New translations template.pot (Portuguese, Brazilian)
[skip actions]
2022-12-05 21:42:48 -08:00
Lucas Nicodemus
da657ab483
Reformat changelog 2022-12-05 21:42:21 -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
Lucas Nicodemus
69f39d3e5e
Merge remote-tracking branch 'sgk/pr2833' into general-devel 2022-12-05 21:39:12 -08:00
James Puleo
0a3b3a1236
Update docs/changelog.md 2022-12-02 13:24:06 -05: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