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

Merge branch 'master' of github.com:TShock/TShock

Browse source
This commit is contained in:
Maverick Motherfucker 2011-06-11 21:31:49 -07:00
commit 322699ff95
3 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/Commands.cs
View file

@ -201,13 +201,16 @@ namespace TShockAPI
commands.Add(new Command("protectspawn", "editspawn", ProtectSpawn)); commands.Add(new Command("protectspawn", "editspawn", ProtectSpawn));
commands.Add(new Command("help", "", Help)); commands.Add(new Command("help", "", Help));
commands.Add(new Command("playing", "", Playing)); commands.Add(new Command("playing", "", Playing));
commands.Add(new Command("online", "", Playing));
commands.Add(new Command("who", "", Playing));
commands.Add(new Command("auth", "", AuthToken)); commands.Add(new Command("auth", "", AuthToken));
commands.Add(new Command("me", "", ThirdPerson)); commands.Add(new Command("me", "", ThirdPerson));
commands.Add(new Command("p", "", PartyChat)); commands.Add(new Command("p", "", PartyChat));
commands.Add(new Command("butcher", "cheat", Butcher));
if (ConfigurationManager.distributationAgent != "terraria-online") if (ConfigurationManager.distributationAgent != "terraria-online")
{ {
commands.Add(new Command("kill", "kill", Kill)); commands.Add(new Command("kill", "kill", Kill));
commands.Add(new Command("butcher", "cheat", Butcher));
commands.Add(new Command("i", "cheat", Item));
commands.Add(new Command("item", "cheat", Item)); commands.Add(new Command("item", "cheat", Item));
commands.Add(new Command("give", "cheat", Give)); commands.Add(new Command("give", "cheat", Give));
commands.Add(new Command("heal", "cheat", Heal)); commands.Add(new Command("heal", "cheat", Heal));
@ -269,8 +272,9 @@ namespace TShockAPI
ConfigurationManager.spawnProtectRadius, ConfigurationManager.defaultMaxSpawns, ConfigurationManager.spawnProtectRadius, ConfigurationManager.defaultMaxSpawns,
ConfigurationManager.defaultSpawnRate); ConfigurationManager.defaultSpawnRate);
Tools.SendMessage(ply, lineThree, Color.Yellow); Tools.SendMessage(ply, lineThree, Color.Yellow);
string lineFour = string.Format("MaxSlots : {0}, RangeChecks : {1}", string lineFour = string.Format("MaxSlots : {0}, RangeChecks : {1}, SpamChecks : {2}",
ConfigurationManager.maxSlots, ConfigurationManager.rangeChecks); ConfigurationManager.maxSlots, ConfigurationManager.rangeChecks,
ConfigurationManager.spamChecks);
Tools.SendMessage(ply, lineFour, Color.Yellow); Tools.SendMessage(ply, lineFour, Color.Yellow);
} }
@ -972,6 +976,8 @@ namespace TShockAPI
Tools.SendMessage(adminplr, "Invalid player!", Color.Red); Tools.SendMessage(adminplr, "Invalid player!", Color.Red);
else if (player == -2) else if (player == -2)
Tools.SendMessage(adminplr, "More than one player matched!", Color.Red); Tools.SendMessage(adminplr, "More than one player matched!", Color.Red);
else if (player == adminplr)
Tools.SendMessage(adminplr, "Can't kill yourself!", Color.Red);
else else
{ {
Tools.SendMessage(adminplr, string.Format("You just killed {0}!", Tools.FindPlayer(player))); Tools.SendMessage(adminplr, string.Format("You just killed {0}!", Tools.FindPlayer(player)));

16
TShockAPI/TShock.cs
View file

@ -19,9 +19,9 @@ namespace TShockAPI
public static string saveDir = "./tshock/"; public static string saveDir = "./tshock/";
public static Version VersionNum = new Version(2, 0, 0, 8); public static Version VersionNum = new Version(2, 1, 0, 0);
public static string VersionCodename = "RSaC (Red Sucks at Coding)"; public static string VersionCodename = "Versioning fails";
private static bool[] BlacklistTiles; private static bool[] BlacklistTiles;
@ -290,12 +290,6 @@ namespace TShockAPI
} }
bool HandleTile(MemoryStream data, GetDataEventArgs e) bool HandleTile(MemoryStream data, GetDataEventArgs e)
{ {
if (Main.player[e.Msg.whoAmI].dead)
{
Tools.ForceKick(e.Msg.whoAmI, "Manipulating tiles when dead");
return true;
}
byte type = data.ReadInt8(); byte type = data.ReadInt8();
int x = data.ReadInt32(); int x = data.ReadInt32();
int y = data.ReadInt32(); int y = data.ReadInt32();
@ -443,12 +437,6 @@ namespace TShockAPI
bool HandleLiquidSet(MemoryStream data, GetDataEventArgs e) bool HandleLiquidSet(MemoryStream data, GetDataEventArgs e)
{ {
if (Main.player[e.Msg.whoAmI].dead)
{
Tools.ForceKick(e.Msg.whoAmI, "Manipulating liquids when dead");
return true;
}
int x = data.ReadInt32(); int x = data.ReadInt32();
int y = data.ReadInt32(); int y = data.ReadInt32();
byte liquid = data.ReadInt8(); byte liquid = data.ReadInt8();

2
Update/Update.csproj
View file

@ -60,7 +60,7 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Resources\TShockAPI.dll" /> <Folder Include="Resources\" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.