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

Fixed conflict

Browse source
This commit is contained in:
Shank 2011-05-30 15:59:42 -06:00
parent 4035c5dd71
commit 97524f1e02
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/TShock.cs
View file

@ -124,13 +124,9 @@ namespace TShockAPI
void OnChat(int ply, string msg, HandledEventArgs handler)
{
if (Main.netMode != 2) { return; }
<<<<<<< HEAD
int x = (int) Main.player[ply].position.X;
int y = (int) Main.player[ply].position.Y;
=======
int x = (int)Main.player[ply].position.X;
int y = (int)Main.player[ply].position.Y;
>>>>>>> a4cf86f85300a81a3eab772d8735dcd7c6747010
if (IsAdmin(ply))
{
if (msg.Length > 5 && msg.Substring(0, 5) == "/kick")