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

Merge branch 'api' of git.assembla.com:terraria into api

Browse source 
Conflicts:
	TShockAPI/TShock.cs
	TShockAPI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
This commit is contained in:
Shank 2011-05-30 15:44:16 -06:00
commit 4035c5dd71
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/TShock.cs
View file

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