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

3962 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lucas Nicodemus
6ed110f862 Change a bounds check to handle a packet instead of letting it go. 
This change reverts mod to line 1525 of GetDataHandlers.cs in
672d360e9d by Deathamx.

We couldn't think of a reason why a bounds check would ever return
false, thus not handling the packet and letting the server accept
it. Therefore, it's now true.

In the future, we need to document handling better.
 2017-12-11 00:28:08 -07:00
Lucas Nicodemus
4b08d61673 Change null check to return true in HandlePlayerUpdate 
After confirming with @QuiCM on this, we couldn't figure out why
this was set to false in the first place. As a result, we changed
it to true to conform with usual logic (bad stuff? reject it.).
 2017-12-11 00:17:58 -07:00
Lucas Nicodemus
9b8aaceb12 Merge remote-tracking branch 'origin/general-devel' into fragments 2017-12-10 23:45:03 -07:00
Lucas Nicodemus
ba851d3570 Remove TShock.CheckProjectilePermission 
Add TSPlayer.HasProjectilePermission() and its inverse:
	TSPlayer.LacksProjectilePermission()
 2017-12-10 23:38:03 -07:00
Lucas Nicodemus
c5f9a51802 Move most of HandleProjectileKill to Bouncer 
Added GetDataHandlers.ProjectileKill hook and related arguments.
Fired when a projectile kill packet is accepted by the server.
 2017-12-10 23:07:17 -07:00
Chris
7349d0e877
Merge pull request #1547 from bartico6/general-devel 
Make TShock pull OTAPI from the correct folder on build
 2017-12-11 10:57:16 +10:30
quake1337
a5e196178e Add credit 2017-12-11 01:16:10 +01:00
quake1337
1f79e14bd7 Make TShock pull OTAPI from the correct folder on build 2017-12-11 01:12:27 +01:00
Lucas Nicodemus
135826f15d
Merge pull request #1544 from Patrikkk/general-devel 
Add missing "if handled - return" code to OnNameCollision.
 2017-12-10 12:41:52 -07:00
Lucas Nicodemus
abaeef5f7e
Merge branch 'general-devel' into general-devel 2017-12-10 12:41:44 -07:00
Patrikk
6f044b2123 Adding missing Changelog. 2017-12-10 20:37:59 +01:00
Lucas Nicodemus
7181757dd3
Changelog bot message is more prodding 
If people keep ignoring the bot, I'm going to make it block merging too.
 2017-12-10 12:26:54 -07:00
Patrikk
740ad4d6c3 Add missing "if handled - return" code. 2017-12-10 20:14:54 +01:00
Lucas Nicodemus
2cfa633df4 Remove commented out code from HandleProjectileKill 2017-12-10 11:26:01 -07:00
Lucas Nicodemus
d3c566db83 Move a large majority of OnPlayerUpdate to Bouncer 
I really really don't understand why we're doing Terraria's data
sync for them (see HandlePlayerUpdate). Someone know why?
 2017-12-10 10:04:27 -07:00
Lucas Nicodemus
949d0e0ffa More remove notes 2017-12-10 08:56:17 -07:00
Lucas Nicodemus
79802cd9e0 Comment more things in Bouncer 2017-12-10 08:54:32 -07:00
Lucas Nicodemus
3e5c1bf0c5 Merge remote-tracking branch 'origin/general-devel' into fragments 2017-12-09 21:06:47 -07:00
Chris
edc16f8816
Merge pull request #1537 from Pryaxis/fix-permdump 
Fix permission dumping
 2017-12-10 14:28:53 +10:30
Chris
ba31d1faab
Merge branch 'general-devel' into fix-permdump 2017-12-10 14:24:27 +10:30
Chris
f689d77a5b
Merge pull request #1532 from Pryaxis/cmdline-fix 
Updates the commandline parser to not be broken.
 2017-12-10 14:23:33 +10:30
Lucas Nicodemus
c7a04c8e1b Merge branch 'fix-permdump' of github.com:Pryaxis/TShock into fix-permdump 2017-12-09 20:43:09 -07:00
Chris
078bd15300
Merge branch 'general-devel' into cmdline-fix 2017-12-10 14:12:58 +10:30
Lucas Nicodemus
691a368425 Change permission node to tshock.cfg.createdumps 2017-12-09 20:42:47 -07:00
Lucas Nicodemus
434e817b68
Merge branch 'general-devel' into fix-permdump 2017-12-09 19:29:34 -07:00
Lucas Nicodemus
677d15efbb
Merge pull request #1539 from Zaicon/fix-itemdump 
Fixed IndexOutOfRange exception
 2017-12-09 19:28:38 -07:00
Zaicon
82f53addd7
Update CHANGELOG.md 2017-12-09 20:12:12 -06:00
Zaicon Kiroshu
4638b85adc Fixed IndexOutOfRange exception 2017-12-09 18:48:40 -06:00
Lucas Nicodemus
14c071350c Mark Utils.DumpPemrissionMatrix as internal 2017-12-09 17:15:21 -07:00
Lucas Nicodemus
985dcebda9 Comment what DumpPermissionMatrix does 2017-12-09 17:14:59 -07:00
Lucas Nicodemus
2e64d65910 Modify call to Utils.Dump() from the server context to not stop 2017-12-09 16:09:53 -07:00
Lucas Nicodemus
aa2f040787 Change command /datadump to /dump-reference-data 2017-12-09 16:03:12 -07:00
Lucas Nicodemus
bdabf020d2 tshock.admin.createdumps is now a default owner level permission 2017-12-09 15:58:42 -07:00
Lucas Nicodemus
419b5415da Updated the changelog 2017-12-09 15:57:57 -07:00
Lucas Nicodemus
63179deaa5 Adds /dumpdata which dumps the permission table & ref data. 2017-12-09 15:54:51 -07:00
Lucas Nicodemus
dd7ffe2d3a Move PlayerKillMeV2 anti-crash to Bouncer 
Removed PacketTypes.PlayerKillMe since it's out of the protocol.
Removed handler method for PlayerKillMe since it's out of the
	protocol.
Updated changelog to reflect new hook changes.
 2017-12-09 13:50:18 -07:00
Lucas Nicodemus
54c33a5a09 Merge remote-tracking branch 'origin/general-devel' into fragments 2017-12-09 10:33:55 -07:00
Lucas Nicodemus
d937789c15
Merge pull request #1536 from Ryozuki/pr-update-otapi 
Update Newtonsoft.Json Fixes #1526
 2017-12-09 10:31:42 -07:00
Lucas Nicodemus
436e91c1f1 Change STS to 1 tile for @bartico6's quality of life changes 
Since these reverts are on a per-tile basis, we only need to revert
the first block not surrounding ones.

Note: May cause problems with dropped sand because of gravity.
 2017-12-09 10:30:20 -07:00
Ryozuki
a146e9bc38 update changelog 2017-12-09 18:25:10 +01:00
Ryozuki
b794fae21d update release script 2017-12-09 18:13:47 +01:00
Ryozuki
6d0a729e5a checkout submodule 2017-12-09 18:09:20 +01:00
Ryozuki
055d25330c update otapi 2017-12-09 17:57:33 +01:00
Lucas Nicodemus
031398591a Merge remote-tracking branch 'origin/general-devel' into fragments 2017-12-09 08:44:49 -07:00
Chris
40616115ac
Merge pull request #1530 from Ryozuki/user_rewrite 
Rename TShock.DB.User to TShock.DB.UserAccount
 2017-12-10 02:11:38 +10:30
Ryozuki
5770be0ac3
Update CHANGELOG.md 2017-12-09 16:20:52 +01:00
Lucas Nicodemus
a5cbeb166b Fix some SendTileSquare calls with proper args 2017-12-09 02:15:31 -07:00
Lucas Nicodemus
760f5518da More patching to fix potential desync (thanks @bartico6)! 2017-12-09 01:50:58 -07:00
Lucas Nicodemus
aa527496dc Replace a coule TileID magic numbers with direc Tcalls. 
Thanks @mistzzt & @QuiCM!
 2017-12-09 01:48:43 -07:00
Lucas Nicodemus
ce822caf2a Implement re-transmit of data if event handled in OnTilEdit 
Thanks to the suggestion of @bartico6, we now re-transmit packets
of world data to prevent desync issues with respect to stopping a
server action but not fixing the client's view of the world.
 2017-12-09 01:39:54 -07:00