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

4242 commits

Author SHA1 Message Date
Lucas Nicodemus
519f94116c
Merge branch 'general-devel' into general-devel 2025-01-26 09:38:37 +09:00
Lucas Nicodemus
18062c55e7
Merge branch 'general-devel' into netitem-changes 2025-01-26 09:02:51 +09:00
Lucas Nicodemus
b984ff8b65
Apply patch from https://github.com/Pryaxis/TShock/pull/3018 
This applies https://github.com/Pryaxis/TShock/pull/3018 as a patch per @punchready because they deleted the head repository so that we can't merge it and none of the git objects have valid refs anymore on the command line and we can't merge it on the gui.
 2025-01-26 08:45:11 +09:00
SGKoishi
65559d5db8
Merge remote-tracking branch 'upstream/general-devel' into pr3005 2025-01-26 01:22:34 +09:00
SGKoishi
6ee22758c1
Merge remote-tracking branch 'upstream/general-devel' into patch-1 2025-01-25 08:05:35 -08:00
Lucas Nicodemus
8f5a81014f
Merge branch 'general-devel' into patch-1 2025-01-25 23:08:28 +09:00
Lucas Nicodemus
a42046e79c
Merge branch 'general-devel' into consistency-playeractive-patch 2025-01-25 23:03:30 +09:00
Lucas Nicodemus
e6b1fb139f
Merge branch 'general-devel' into netitem-changes 2025-01-25 22:42:52 +09:00
Lucas Nicodemus
b9d984863d
Merge branch 'general-devel' into pr3005 2025-01-25 22:40:03 +09:00
Lucas Nicodemus
1762f59a78
Merge branch 'general-devel' into general-devel 2025-01-25 22:37:52 +09:00
renovate[bot]
9aba57dab6
Update dependency MySql.Data to 8.4.0 2025-01-25 13:31:02 +00:00
Lucas Nicodemus
b4968adb7d
Fix typo in config file 
Closes https://github.com/Pryaxis/TShock/pull/3052
 2025-01-25 22:29:56 +09:00
Lucas Nicodemus
748b516f3f
Merge branch 'general-devel' into dump-commands 2025-01-25 21:30:12 +09:00
quicm
5075997264 Add bandaid fix to RemoteClient.Reset for SecAd GHSA-hvm9-wc8j-mgrc 2024-12-17 01:15:56 +10:30
Cai
7419205548 rename 2024-07-31 19:24:53 +08:00
Cai
8df09cb4a8 fix: /help, /me, and /p commands can't work in non-English languages 2024-07-31 19:11:50 +08:00
Arthri
5c4db00f1e Fix Cursed Flare 2024-04-24 06:01:04 +00:00
ZakFahey
a19ac72e0d Lazy initialize TextLog._logWriter 
There is an instance of this in SqlLog that's used as a backup, but since the StreamWriter is created in the constructor, the file is created too. This means that you'll get an empty text log created, every time a server starts up, even if you have text logs disabled. This is especially problematic when you have a multi-server setup with file write conflicts.
 2024-02-18 11:36:26 -08: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
Chris
3e64a9b82b
Merge branch 'general-devel' into patch-1 2023-08-15 19:17:35 +09:30
Zoom L1
228d5c7101
Merge branch 'general-devel' into netitem-changes 2023-06-17 19:00:12 +07:00
Stargazing Koishi
f66ad72e2c
Update TShockAPI/Commands.cs 
Co-authored-by: punchready <22683812+punchready@users.noreply.github.com>
 2023-06-11 22:20:48 -07:00
SGKoishi
5bcde689d4
Fix a typo in gbuff 2023-06-11 22:11:20 -07:00
AkjaHAsLk1IALk0MasH
4eb2aa49de Removed unnecessary documentation 2023-06-08 18:11:26 +07:00
AkjaHAsLk1IALk0MasH
3a90029d51 Allowed to receive an item if it is 0. 2023-06-08 16:33:32 +07:00
punchready
149ca8a70c
Remove duplicate conversion spread matching 2023-06-07 03:05:10 +02:00
AkjaHAsLk1IALk0MasH
914d743264 Changed the method from NetItem.Build to NetItem.ToItem. 2023-06-06 19:15:58 +07:00
punchready
07bf66f072
Fix MatchPlacement allowing auto breakable tiles 2023-06-06 13:25:03 +02:00
Chris
d15b25aa06
Merge branch 'general-devel' into patch-1 2023-06-06 20:45:57 +09:30
Chris
cfccc3a871
Merge branch 'general-devel' into patch-1 2023-06-06 20:42:37 +09:30
AkjaHAsLk1IALk0MasH
86be1738cc Added a constructor with arguments taking Terraria.Item. 2023-05-14 10:13:59 +07:00
AkjaHAsLk1IALk0MasH
62b8e5067c Added the `NetItem.Build' method. 
The method will create a Terraria.Item instance based on the data from the structure.
 2023-05-14 10:13:25 +07:00
AkjaHAsLk1IALk0MasH
c3f5994451 Added optional arguments stack and prefixId to the NetItem constructor 2023-05-14 10:08:02 +07:00
AkjaHAsLk1IALk0MasH
4d92f11cc8 Added the TSPlayer.Hostile property. 
It gets `TPlayer.hostile`.
I also wanted to add the ability to change `TPlayer.hostile`, but noticed a property `TSPlayer.Team`. You can only use the `TSPlayer.SetTeam` method to change it. So it's exactly the same here: You can use the method `TSPlayer.SetPvP` (By the way, it should be renamed to `TSPlayer.SetHostile`)
 2023-05-14 09:56:47 +07:00
AkjaHAsLk1IALk0MasH
2f7514c0ef Added an overload for TSPlayer.GiveItem 
Added `TShockAPI.NetItem` structure to the parameters.
 2023-05-14 09:43:18 +07:00
AkjaHAsLk1IALk0MasH
3d585d4d69 Added the UpdateSection method. 
I described its action in the comments.
 2023-05-14 09:38:35 +07:00
AkjaHAsLk1IALk0MasH
d9352d6902 Added an exception that occurs when the developer changes team. 2023-05-14 09:23:42 +07:00
AkjaHAsLk1IALk0MasH
3647bbaf54 Added a reason for the KillPlayer and DamagePlayer methods. 
Added overloads that have a cause in the parameters (`PlayerDeathReason`)
 2023-05-14 09:20:20 +07:00
AkjaHAsLk1IALk0MasH
fa9e4419bd Added documentation to the withMsg parameter in the SetPvP method. 2023-05-14 09:16:14 +07:00
AkjaHAsLk1IALk0MasH
c047b0e87d Added the Client property. 
The `Client` property gets data from the array `Terraria.Netplay.Clients`.
 2023-05-14 09:14:43 +07:00
AkjaHAsLk1IALk0MasH
6d4682ed7e Updated the GodMode field. 
* Changed the GodMode field to a property that is controlled by the journey mode.
- Removed the call to godmode in `Commands.ToggleGodMode`.
 2023-05-14 09:11:18 +07:00
Stargazing Koishi
51ecef73a1
Optimize Linq 
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
 2023-05-13 04:09:15 -07:00
SGKoishi
3d11d84d73
Fix dump-reference-data mutate command name 2023-05-13 03:56:07 -07:00
Lucas Nicodemus
c67d5cf152
Version tick: 5.2 2023-05-10 01:51:05 -04:00
punchready
0dd15277e4 Remove old STR handler 2023-05-09 12:41:54 +02:00
Stargazing Koishi
f1b67f8602
Merge branch 'general-devel' into consistency-playeractive-patch 2023-04-28 15:53:43 -07:00
punchready
b57eb91230 Rewrite conversion spread handling to be much more accurate 2023-04-05 06:44:21 +02:00