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:
high 2011-06-20 17:07:42 -04:00
commit df7b0e8f57
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/Log.cs
View file

@ -117,7 +117,17 @@ namespace TShockAPI
return; return;
} }
string caller = "TShock"; StackTrace trace = new StackTrace();
StackFrame frame = null;
frame = trace.GetFrame(2);
string caller = "TShock: ";
if (frame != null && frame.GetMethod().DeclaringType != null)
{
caller += frame.GetMethod().DeclaringType.Name + ": ";
}
_logWriter.WriteLine(string.Format("{0} - {1}: {2}: {3}", _logWriter.WriteLine(string.Format("{0} - {1}: {2}: {3}",
DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture), DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture),

4
TShockAPI/TShock.cs
View file

@ -415,8 +415,8 @@ namespace TShockAPI
{ {
int oldSpawnX = Main.spawnTileX; int oldSpawnX = Main.spawnTileX;
int oldSpawnY = Main.spawnTileY; int oldSpawnY = Main.spawnTileY;
Main.spawnTileX = x; Main.spawnTileX = x/16;
Main.spawnTileY = y; Main.spawnTileY = y/16;
//Send only that player the new spawn point data //Send only that player the new spawn point data
NetMessage.SendData(7, ply, -1, "", 0, 0f, 0f, 0f); NetMessage.SendData(7, ply, -1, "", 0, 0f, 0f, 0f);
//Force them to respawn //Force them to respawn