themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'master' into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2013-09-15 15:24:15 -06:00
commit dd05c524ec
2 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
README.md
View file

@ -1,25 +1,27 @@
TShock is a server modification for Terraria. # TShock
__Continuous Integration__: http://ci.tshock.co/ TShock is a server modification for Terraria, written in C#, and based upon the [Terraria Server API](https://github.com/Deathmax/TerrariaAPI-Server). It uses JSON for configuration management, and offers several features not present in the Terraria Server normally.
__Support Forums__: http://tshock.co/ ## Features
__Wiki__: https://tshock.atlassian.net/wiki/display/TSHOCKPLUGINS/Home * MySQL support
* Permissions
* Multiple administrators
* Anti-cheat
* User registration
* Reserved slots
* User punishment (kicking, banning, muting)
---- ## Community
### Teamspeak Feeling like helping out? Want to find an awesome server? Some awesome plugins?
We communicate on the ShankShock Temspeak server whilst programming. * [Website & Forums](http://tshock.co/xf/)
* [Wiki](https://tshock.atlassian.net/wiki/display/TSHOCKPLUGINS/Home)
* [IRC: #tshock @ irc.rizon.net](http://tshock.co/xf/index.php?ezirc/)
__IP__: ts3.shankshock.com ## Download
__Port__: 9987 * [Github Releases](https://github.com/TShock/TShock/releases)
* [Download Archive](https://github.com/TShock/TShock/downloads)
### IRC * [Latest Version (4.0.5)](https://s3.amazonaws.com/tshock/TShock+4.0.5.zip)
We love IRC (although a little less than Teamspeak). If you need support, or just want to hang around, feel free to join.
__IP__: irc.shankshock.com
__Channel__: #terraria

5
TShockAPI/Rest/Rest.cs
View file

@ -135,6 +135,11 @@ namespace Rests
return; return;
var str = JsonConvert.SerializeObject(obj, Formatting.Indented); var str = JsonConvert.SerializeObject(obj, Formatting.Indented);
var jsonp = e.Request.Parameters["jsonp"];
if (!string.IsNullOrWhiteSpace(jsonp))
{
str = string.Format("{0}({1});", jsonp, str);
}
e.Response.Connection.Type = ConnectionType.Close; e.Response.Connection.Type = ConnectionType.Close;
e.Response.ContentType = new ContentTypeHeader("application/json"); e.Response.ContentType = new ContentTypeHeader("application/json");
e.Response.Add(serverHeader); e.Response.Add(serverHeader);