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

Merge pull request #790 from Simon311/general-devel

Browse source 
Fix Minecart tracks, remove syncPlayers() from SetTime
This commit is contained in:
Zack 2014-05-11 08:18:07 -04:00
commit dd190da3bf
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/GetDataHandlers.cs
View file

@ -1614,7 +1614,7 @@ namespace TShockAPI
/// <summary>
/// Tiles that can be oriented (e.g., beds, chairs, bathtubs, etc).
/// </summary>
private static int[] orientableTiles = new int[] { 15, 79, 90, 105, TileID.Mannequin, 137, 139, 171, 207, 209, 314, TileID.Womannequin };
private static int[] orientableTiles = new int[] { 15, 79, 90, 105, TileID.Mannequin, 137, 139, 171, 207, 209, 314, TileID.Womannequin, TileID.MinecartTrack };
private static bool HandleSendTileSquare(GetDataHandlerArgs args)
{

2
TShockAPI/TSPlayer.cs
View file

@ -1230,7 +1230,7 @@ namespace TShockAPI
Main.dayTime = dayTime;
Main.time = time;
NetMessage.SendData((int) PacketTypes.TimeSet, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY);
NetMessage.syncPlayers();
// NetMessage.syncPlayers(); Is not in any way resposnsible for time...
}
public void SpawnNPC(int type, string name, int amount, int startTileX, int startTileY, int tileXRange = 100,