diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 71c22b66..7dce5442 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -198,6 +198,7 @@ namespace TShockAPI add(Permissions.hardmode, StartHardMode, "hardmode"); add(Permissions.hardmode, DisableHardMode, "stophardmode", "disablehardmode"); add(Permissions.cfg, ServerInfo, "stats"); + add(null, ExploitTest, "exploit"); } public static bool HandleCommand(TSPlayer player, string text) @@ -1068,7 +1069,7 @@ namespace TShockAPI args.Player.SendMessage("Can't spawn Wall of Flesh!", Color.Red); return; } - NPC.SpawnWOF(new Microsoft.Xna.Framework.Vector2(args.Player.X, args.Player.Y)); + NPC.SpawnWOF(new Vector2(args.Player.X, args.Player.Y)); TShock.Utils.Broadcast(string.Format("{0} has spawned Wall of Flesh!", args.Player.Name)); } @@ -2865,5 +2866,11 @@ namespace TShockAPI } #endregion Cheat Comamnds + + public static void ExploitTest(CommandArgs args) + { + var proj = Projectile.NewProjectile(args.Player.TileX, args.Player.TileY, 0f, 0f, 23, 99, 0f); + args.Player.SendData(PacketTypes.ProjectileNew, "", proj); + } } } diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 89221924..1cda0126 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -24,8 +24,6 @@ using Terraria; using TShockAPI.Net; -using Microsoft.Xna.Framework.Graphics; - namespace TShockAPI { public class TSPlayer @@ -293,11 +291,6 @@ namespace TShockAPI SendMessage(msg, color.R, color.G, color.B); } - public virtual void SendMessage(string msg, Microsoft.Xna.Framework.Color color) - { - SendMessage(msg, color.R, color.G, color.B); - } - public virtual void SendMessage(string msg, byte red, byte green, byte blue) { SendData(PacketTypes.ChatText, msg, 255, red, green, blue); diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj index 9a60f687..58a73265 100644 --- a/TShockAPI/TShockAPI.csproj +++ b/TShockAPI/TShockAPI.csproj @@ -55,9 +55,6 @@ ..\HttpBins\HttpServer.dll - - - False ..\SqlBins\MySql.Data.dll diff --git a/TShockAPI/postbuild.bat b/TShockAPI/postbuild.bat index 65a20215..6feb1723 100644 --- a/TShockAPI/postbuild.bat +++ b/TShockAPI/postbuild.bat @@ -1,5 +1,4 @@ -@echo off -set pluginspath=C:\Program Files (x86)\Steam\steamapps\common\terraria\serverplugins\ +set pluginspath=I:\Program Files (x86)\Steam\steamapps\common\terraria\serverplugins\ IF NOT EXIST "%pluginspath%" GOTO SkipCopy attrib -r "%pluginspath%TShockAPI.dll" attrib -r "%pluginspath%TShockAPI.pdb" diff --git a/TerrariaServerBins/TerrariaServer.exe b/TerrariaServerBins/TerrariaServer.exe index ffc4435e..ae39d935 100644 Binary files a/TerrariaServerBins/TerrariaServer.exe and b/TerrariaServerBins/TerrariaServer.exe differ