Commit graph

2665 commits

Author SHA1 Message Date
White
49128a8aac Fixed GetDataHandlers so that the extra accessory slot is tracked correctly 2015-10-09 17:48:35 +10:30
White
a31c7b207b Merge pull request #1097 from darkunderdog/patch-2
Fixes issue not using UUID login when SSC is enabled
2015-10-08 12:16:34 +10:30
Beau Hastings
c0771556fc Fixes #1116
Signed-off-by: Beau Hastings <beausy@gmail.com>
2015-10-07 11:42:20 -05:00
White
d9a75dad42 /reload command now uses Permissions.cfgreload like it says it does 2015-09-29 19:02:25 +09:30
White
90655adf8c ActiveChest is now correctly tracked. Fixes #1122 2015-09-29 18:12:09 +09:30
Lucas Nicodemus
44575db64e Merge pull request #1120 from Celant/general-devel
Added rate limiting to RESTful API
2015-09-24 11:29:47 -06:00
George
09a8f95a70 Added rate limiting to RESTful API
Added token bucket and timer to degrade token bucket

Modified REST API rate limiting

Changed limiting to only be on token create and v2 token create
Added config options to choose time limits
Passed HttpContext to the execute method of endpoints

Made blocking failed API logins optional

Changed error codes on failed login to be ambiguous
Added config to decide whether all or failed logins are limited

Changed config variable names

Cleaned up duplicate code in REST rate limiting

Fixed my typo

Changed error 431 to 403
2015-09-24 15:47:46 +01:00
White
9da98f4263 Merge pull request #1119 from tysonstrange/general-devel
Update Utils.cs
2015-09-24 23:27:39 +09:30
tysonstrange
6abff7e3df Update Utils.cs
/reload doesn't reload proj and tile bans.
2015-09-22 20:54:34 +10:00
Tyler Watson
3de8889688 Reverted the silly on leave hook change 2015-09-18 22:05:11 +10:00
tysonstrange
d68fe61d21 Update CharacterManager.cs 2015-09-18 07:58:42 +10:00
tysonstrange
9c3d38e23d Update CharacterManager.cs 2015-09-17 21:10:30 +10:00
tysonstrange
65924b9f15 Update TSPlayer.cs 2015-09-17 21:08:53 +10:00
Tyler Watson
27ebc925b7 Tidied up server leave hook saving the world twice 2015-09-12 19:24:05 +10:00
Tyler Watson
f7826f681a Removed debug cruft from csproj 2015-09-12 18:13:40 +10:00
Tyler Watson
049abd9146 Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel 2015-09-12 18:08:31 +10:00
Tyler Watson
34f28bace3 TShock 4.3.10 - APIVersion 1.22 2015-09-12 18:08:10 +10:00
White
44430a82c9 Added target dummy to OrientableTiles. Fixes #999 2015-09-12 12:58:20 +09:30
White
ba677f83cb All OnSecondUpdate Disable calls now use one set of DisableFlags. Fixes #1072 2015-09-12 12:57:00 +09:30
White
1faf064983 Changed the way the SecondUpdate checks work 2015-09-12 12:50:01 +09:30
White
33739c4f07 Added a new Disable method with flags to determine where the message is logged to.
Obsoleted the old disable method
Added a config option to disable OnSecondUpdate logs (disable message is written only to console if set to true)
Updated all instances of the obsolete Disable method to the new Disable method
2015-09-12 11:33:17 +09:30
White
2e5eaae0b3 Checking whether a point is in a region no longer requires to region to be protected.
Renamed some methods to conform to C# conventions.
2015-09-06 18:49:57 +09:30
White
502afb4e6f DCU fix, courtesy of 412fcf233c. Closes #1018 2015-09-06 18:30:40 +09:30
Tyler Watson
4bd1b6a07a Refactored StartInvasions to use Main.startInvasion method
It appears that there is a whole lot of display logic in the official
Terraria StartInvasion method, which is why martian invasion wasn't
working properly.

TSAPI now contains a slighly modified startInvasion method which takes
an optional invasion size, so TShock's StartInvasion method has now
been refactored to use TSAPI's invasion, restoring martian invasion
functionality.

Fixes #1087
2015-08-29 16:19:14 +10:00
White
218bd98556 Added newline parsing to SendMessage to prevent plugins doing funky stuff to chat 2015-08-26 20:55:32 +09:30
White
24184a8061 Itembans check dyes, misc dyes, and misc equips 2015-08-26 20:48:25 +09:30
DarkunderdoG
1cb68cefd8 Fixes issue not using UUID login when SSC is enabled 2015-08-23 18:12:11 -06:00
Tyler Watson
01486f7ba9 Fixed an issue preventing bans being added when a ban already existed
Fixes #1094
2015-08-21 22:58:52 +10:00
Lucas Nicodemus
87e846e630 Version Tick: 4.3.9 2015-08-16 22:10:00 -06:00
Tyler Watson
ac531a7d14 Removing TSPlayer.user from heapshot 2015-08-16 14:15:20 +10:00
Lucas Nicodemus
c004fec56c Version tick: 4.3.8 2015-08-07 07:34:56 -06:00
Lucas Nicodemus
c073100c0a Update Submodule; Update to API 1.21 2015-08-07 07:32:40 -06:00
Lucas Nicodemus
95ef7c9d85 Fix #1063 2015-07-30 16:43:45 -06:00
Lucas Nicodemus
9af4980b60 /auth now forcekicks if auth is disabled
Update submodule
2015-07-30 16:10:59 -06:00
Enerdy
2320613a1d Add GetItemFromTag(), null check on item names. 2015-07-29 15:27:16 +01:00
White
c7711b2906 Allow[Hallow/Corruption/Crimson]Creep in config now work
Fixes #1043
2015-07-25 13:06:21 +09:30
Lucas Nicodemus
835f507672 Version tick: 4.3.7 2015-07-24 11:51:35 -06:00
Lucas Nicodemus
97f0bd5aac Tick to 4.20 2015-07-23 10:49:49 -06:00
Lucas Nicodemus
8c130f177c Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel 2015-07-23 10:34:55 -06:00
Lucas Nicodemus
45ed4237a7 Version tick: 4.3.6 2015-07-23 10:34:33 -06:00
Tyler Watson
7717f6d9d5 Removed -world handling from inside TShock
Seriously, when has it ever been a good idea to handle TSAPI commandline
mechanisms from a plugin?  TSAPI related command line parameters need to
be handled from inside TSAPI.
2015-07-23 18:41:18 +10:00
White
1825a822a0 Merge pull request #1033 from NyxStudios/proj-permissions
Fix more projectile permission checks.
2015-07-21 12:54:14 +09:30
White
4371ad4d9a Logging out is now safe in SSC. Fixes #1037 2015-07-20 23:25:33 +09:30
Enerdy
0b99aceeb9 Add projectile 465 to list of projectile ignores, fix another previously added ignore. 2015-07-18 21:30:16 +01:00
George
320d725136 Merge remote-tracking branch 'upstream/general-devel' into general-devel
Conflicts:
	TerrariaServerAPI
2015-07-18 12:24:29 +01:00
George
0c46a2ddcf Move three startup args back to ServerApi 2015-07-18 11:02:50 +01:00
Denwey Tharkt
e8ce773fdb Target Dummies no longer get butchered by /butcher. Fixes #1025 2015-07-17 20:38:56 -03:00
George
8cf78be440 Move all startup arguments to TShock from API 2015-07-17 22:52:40 +01:00
Ijwu
6f0a23c8fc Merge pull request #1017 from Patrikkk/general-devel
Add HandlePlaceObject
2015-07-17 13:35:24 -04:00
White
07d4b397e2 Remove obsolete cloud save parameter 2015-07-17 13:49:20 +09:30