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

4902 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris
4802ebed91 Make gem locks work properly. Closes #2140 and #2036 2020-11-13 19:04:53 +10:30
Chris
db10bf22e7 Refectoring continued - rename STS Handler to STR Handler 2020-11-13 18:50:54 +10:30
Chris
77fd8c9c9f Add calculated rollback rectangle for tile edits 2020-11-13 18:32:52 +10:30
Chris
ca38d64632 The great refactoring! Squares to Rectangles 2020-11-13 17:46:00 +10:30
Chris
f513ec24ad Add extra accessory slots to TSPlayer.Accessories 2020-11-13 17:44:54 +10:30
Chris
7122e5fb9a Update TSPlayer to allow sending tile rectangles 2020-11-13 17:44:27 +10:30
Chris
7ea1b8c482 Update submodule for 1.4.1.2 2020-11-12 22:44:04 +10:30
Chris
4a2dfac73f
Merge pull request #2151 from Stealownz/general-devel 
Added Torch God's Favor support for SSC.
 2020-11-02 18:16:47 +10:30
Stealownz
d90302fcdc Update CHANGELOG.md 2020-11-01 22:56:11 +08:00
Stealownz
8969ce4a94 Add Torch God's Favor to SSC 
Closes #2031
 2020-11-01 22:55:50 +08:00
Chris
25e37947f7 Should probably list Terraria version support in the changelog 2020-10-15 19:53:24 +10:30
Chris
8d8b51dfea Changelog update for pre-13 2020-10-15 19:52:25 +10:30
Chris
c3b1bb3d0e Update submodule for 1.4.1.1 2020-10-15 19:02:43 +10:30
Chris
1720301212
Merge pull request #2130 from Quinci135/patch-3 
Added 1.4.1.0 player inflicted debuffs to bouncer
 2020-10-15 19:00:41 +10:30
Quinci135
1d7a0e8e6e Update submodule. 1.4.0.5 -> 1.4.1.0 2020-10-14 16:03:02 -07:00
Quinci135
253c239f86
Add missing comma 2020-10-14 15:45:43 -07:00
Quinci135
c2c24a3423
Update CHANGELOG.md 2020-10-14 15:41:01 -07:00
Quinci135
50e0bf0290
Added 1.4.1.0 player inflicted debuffs to bouncer 
OnFire3/Hellfire - New magma stone debuff that deals 15 dps instead of 4 dps
Frostburn2/Frostbite - Frost armor new set bonus 25 dps instead of 8 dps
BoneWhipNPCDebuff - Debuff applied from new Spinal Tap whip
 2020-10-14 15:21:16 -07:00
Chris
54ad8604aa
Merge pull request #2101 from ZakFahey/general-devel 
Fix config file access errors when starting up multiple TShock servers at once
 2020-08-06 11:30:51 +09:30
ZakFahey
90f519a1c6 Overwrite the config if any new fields are missing 2020-08-01 10:13:04 -07:00
ZakFahey
be2040a740 Update CHANGELOG.md 2020-07-27 10:10:14 -07:00
ZakFahey
ccb2a00a71 Fix config file access errors when starting up multiple TShock servers at once 
Use case would be multi-server networks. This commit ensures that sscconfig.json is read with FileShare.Read enabled and stops writing to config.json and sscconfig.json on server load immediately after reading it if the file already exists, which is a no-op since neither of the config files have changed at that point.
 2020-07-27 10:05:28 -07:00
Chris
57b12d20b0
Merge pull request #2085 from Zennos/gravedigger-shovel-support 
Adding Gravedigger's Shovel support
 2020-07-08 10:36:26 +09:30
Chris
e7f6b921e9
Merge branch 'general-devel' into gravedigger-shovel-support 2020-07-08 10:26:43 +09:30
Edoan
838d55a737
Updated GravediggerShovel ID 
Co-authored-by: Chris <2648373+QuiCM@users.noreply.github.com>
 2020-07-07 21:49:08 -03:00
Lucas Nicodemus
1830685d23
Merge pull request #2088 from PythonTryHard/patch-1 
Fixing 2 dead links in README.md
 2020-07-07 10:12:48 -07:00
PythonTryHard
eecf1b221d
Fixing 2 dead links 2020-07-07 22:47:24 +07:00
Edoan
882df19feb
Update CHANGELOG.md 2020-07-05 13:53:28 -03:00
Edoan
c285b50d9f Add Graveyardigger's Shovel support 2020-07-05 13:17:08 -03:00
Lucas Nicodemus
7d310b7780
Add upcoming changes section to changelog 
Following pre-release 12, renormalize the changelog so that there's a section for new changes.
 2020-06-27 01:49:40 -07:00
Lucas Nicodemus
a82174fef8
Update changelog for PR12 2020-06-27 01:42:40 -07:00
Chris
ece40af089
Merge pull request #2061 from Pryaxis/addtileentityinteraction 
RequestTileEntityInteraction hook and handling.
 2020-06-27 17:57:15 +09:30
Patrikkk
530bc95123 RequestTileEntityInteractionHandler - Use object size for building perm check. 
This commit will modify the RequestTileEntityInteractionHandler to use HasBuildPermissionForTileObject when checking for building permissions for Hat Rack and Display Doll to give an accurate response wether or not any part of the object has an overlapping protected region.
 2020-06-27 10:22:03 +02:00
Lucas Nicodemus
0cfe670038
Merge branch 'general-devel' into addtileentityinteraction 2020-06-25 21:57:00 -07:00
Lucas Nicodemus
42f0e58928
Normalize changelog 2020-06-25 21:54:38 -07:00
Lucas Nicodemus
d60067dec0
Merge pull request #2073 from Pryaxis/fixtileplacement 
Missing parenthesis from an if logic. Fix valid Tile placement reject.
 2020-06-25 17:40:41 -07:00
Patrikkk
05829dee3b Missing parenthesis from an if logic. Fix Tile placement reject. 2020-06-25 17:08:58 +02:00
Patrikkk
d4e4692d8b Merge branch 'general-devel' into addtileentityinteraction 2020-06-25 13:41:14 +02:00
Chris
eee7fac1a8
Merge pull request #2062 from Pryaxis/displaydollsynchook 
Displaydollsynchook
 2020-06-25 11:43:56 +09:30
Patrikkk
c6723dbfa4
Merge branch 'general-devel' into addtileentityinteraction 2020-06-25 01:52:06 +02:00
Patrikkk
89ab7be0f8 TileEntityInteraction - Pass TileEntity object instead of ID in args. 2020-06-25 01:51:30 +02:00
Patrikkk
b70f4fe96e
Merge branch 'general-devel' into displaydollsynchook 2020-06-25 01:42:58 +02:00
Patrikkk
38a1351d38 Register DisplayDollItemSyncHandler. 
Moved the type check for 0 before itemSetDefaults to have less code run if the empty slots are clicked.
 2020-06-25 01:42:22 +02:00
Chris
2cf0808420
Merge pull request #2051 from moisterrific/patch-18 
Add spawnpets perm to trustedadmin & owner
 2020-06-24 15:11:35 +09:30
Chris
f1392cfa52
Merge branch 'general-devel' into patch-18 2020-06-24 15:08:52 +09:30
Chris
d4c248dbad
Merge pull request #2060 from Pryaxis/commandscleanup 
Command.cs - Multiple minor changes.
 2020-06-24 14:59:32 +09:30
Patrikkk
90dd61e668 Moving the DisplayDollItemSync hook inside null check. 
In crafted (hacked) packet sending, people could send the DisplayDollItemSync packet with an entity ID that is not actually a display doll. This would not happen in a normal scenario.
If they send the crafted packet, our hook would have been invoked and it would have contain a null TEDisplayDoll object since we tried to get the TileEntity object as a TEDisplayDoll object.
 2020-06-21 15:03:08 +02:00
Patrikkk
10a9ee399a Update CHANGELOG.md 
Loggin latest change of adding DisplayDollItemSyncHandler.
Updating missing author for previous changes.
 2020-06-19 14:26:25 +02:00
Patrikkk
64e61b8ed9 Add DisplayDollItemSyncHandler 
In a previous PR I have added the tile entity request packet handler which checks for building permissions to prevent the unauthorized player to open a DisplayDoll and see its content.

This Handler is being added to prevent *Hackers* from modifying a DisplayDoll through direct/crafted packet sending, or by sending raw byte data to the server.
In a valid enviroment, the player couldn't even get to see the content of the doll in the first place, to then try to modify it's items.

Because of this,  I do not bother with making sure the player gets their item back.
 2020-06-19 14:21:45 +02:00
Patrikkk
408eaf4383 Add TEDisplayDoll object to the event args. 2020-06-19 14:16:27 +02:00