Commit graph

3077 commits

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
quake1337
1f79e14bd7 Make TShock pull OTAPI from the correct folder on build 2017-12-11 01:12:27 +01: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
ba31d1faab
Merge branch 'general-devel' into fix-permdump 2017-12-10 14:24:27 +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
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
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
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
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
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
Lucas Nicodemus
eed7b3fad2 Document what TSPlayer.SendTileSquare does 2017-12-09 01:35:27 -07:00
Lucas Nicodemus
cdfb056903 Include feedback from @bartico6 on a magic number 2017-12-09 01:31:40 -07:00
Lucas Nicodemus
46617e61d0 Update changelog re. new hook changes 2017-12-09 01:29:23 -07:00
Lucas Nicodemus
c891a81f67 Move NewProjectile into Bouncer 2017-12-09 01:19:05 -07:00
Chris
c4129cf645 Updates the commandline parser to not be broken.
It should now correctly parse a commandline such as `["", "-flag", "-flag", "arg" ... "etc" ]`
2017-12-09 15:19:34 +10:30
Lucas Nicodemus
b5a40a4472 Comment OnPlaceObject related hook stuff 2017-12-07 21:46:45 -07:00
Lucas Nicodemus
914782ab9e Create hook PlaceObject; move anti-hack to Bouncer 2017-12-07 21:43:33 -07:00
Edgar Luque
07da3d5f58 missed some more declarations 2017-12-08 01:48:08 +01:00
Edgar Luque
5c24ba6f8d missed UserAccount declarations 2017-12-08 01:43:13 +01:00
Edgar Luque
6589531868 Renamed TShockAPI.DB 'User' to 'UserAccount' 2017-12-08 01:38:15 +01:00
Lucas Nicodemus
dbed5e3d5a Merge branch 'general-devel' into fragments 2017-12-06 23:45:05 -07:00
Lucas Nicodemus
6630b70ae1 Un-botch tab/spacing in this file. Thanks VS Code!
Now I know that if I merely open and save a file using Visual Studi
o code, it will automatically munge my tab/spaces on two lines just
for kicks. Thanks Microsoft! You're great at this!
2017-12-06 23:42:14 -07:00
Lucas Nicodemus
c46dae328d Optimize imports
I now have VSCode installed for one reason: to optimize imports.

This required:

1. Installing VSCode.
2. Installing OmniSharp in VSCode.
3. Installing .NET Core so that OmniSharp could start in VSCode.

VSCode is a Microsoft product. It doesn't ship .NET Core. Or Omni
Sharp. Instead, you have to do all of this yourself.

It's not batteries included or anything.

It's actually harder to use OmniSharp in VSCode than it is to use
it in Sublime Text. Except Sublime Text's OmniSharp maintainer
went off and abandoned the project without telling anyone at OmniS
harp. Which gave me the idea that OmniSharp still was maintained
on Sublime Text.

And I just upgraded my Sublime Text license today.

Thanks OmniSharp developer.
2017-12-06 23:37:09 -07:00
Lucas Nicodemus
a4d9f0295a Move OnTileEdit stuff to Bouncer
There are probably a few components in here that don't make sense
for bouncer (looking at you, regions code). However, it's on my todo
list rather than being an imminent thing.
2017-12-06 22:16:19 -07:00
Lucas Nicodemus
4e3cd00848 Merge branch 'general-devel' into fragments 2017-12-06 21:14:45 -07:00
Lucas Nicodemus
8708d55d86 But still use discouragement colors 2017-12-06 17:39:09 -07:00
Lucas Nicodemus
e91968ca91 Revert "Remove superadmin customization config options"
This reverts commit 1e68ac22c7.
2017-12-06 17:35:51 -07:00