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

Size changed from just 3 to <6. Chairs/Beds should be working now.

Browse source
This commit is contained in:
high 2011-07-07 22:42:22 -04:00
parent d689fac4ce
commit 07a758d0e6
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/GetDataHandlers.cs
View file

@ -181,7 +181,7 @@ namespace TShockAPI
int tilex = args.Data.ReadInt32(); int tilex = args.Data.ReadInt32();
int tiley = args.Data.ReadInt32(); int tiley = args.Data.ReadInt32();
if (size != 3) if (size > 5)
return true; return true;
var tiles = new NetTile[size, size]; var tiles = new NetTile[size, size];

22
TShockAPI/TShock.cs
View file

@ -80,18 +80,18 @@ namespace TShockAPI
{ {
HandleCommandLine(Environment.GetCommandLineArgs()); HandleCommandLine(Environment.GetCommandLineArgs());
ConfigFile.ConfigRead += OnConfigRead;
Bans = new BanManager(FileTools.BansPath);
Backups = new BackupManager(Path.Combine(SavePath, "backups"));
FileTools.SetupConfig();
#if DEBUG #if DEBUG
Log.Initialize(Path.Combine(SavePath, "log.txt"), LogLevel.All, false); Log.Initialize(Path.Combine(SavePath, "log.txt"), LogLevel.All, false);
#else #else
Log.Initialize(Path.Combine(SavePath, "log.txt"), LogLevel.All & ~LogLevel.Debug, false); Log.Initialize(Path.Combine(SavePath, "log.txt"), LogLevel.All & ~LogLevel.Debug, false);
#endif #endif
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
Bans = new BanManager(FileTools.BansPath);
Backups = new BackupManager(Path.Combine(SavePath, "backups"));
ConfigFile.ConfigRead += OnConfigRead;
FileTools.SetupConfig();
Log.ConsoleInfo(string.Format("TShock Version {0} ({1}) now running.", Version, VersionCodename)); Log.ConsoleInfo(string.Format("TShock Version {0} ({1}) now running.", Version, VersionCodename));
@ -106,8 +106,7 @@ namespace TShockAPI
NetHooks.GreetPlayer += OnGreetPlayer; NetHooks.GreetPlayer += OnGreetPlayer;
NetHooks.SendData += OnSendData; NetHooks.SendData += OnSendData;
NpcHooks.StrikeNpc += NpcHooks_OnStrikeNpc; NpcHooks.StrikeNpc += NpcHooks_OnStrikeNpc;
WorldHooks.SaveWorld += OnSaveWorld;
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
Bans.LoadBans(); Bans.LoadBans();
GetDataHandlers.InitGetDataHandler(); GetDataHandlers.InitGetDataHandler();
@ -133,7 +132,6 @@ namespace TShockAPI
NetHooks.GreetPlayer -= OnGreetPlayer; NetHooks.GreetPlayer -= OnGreetPlayer;
NetHooks.SendData -= OnSendData; NetHooks.SendData -= OnSendData;
NpcHooks.StrikeNpc -= NpcHooks_OnStrikeNpc; NpcHooks.StrikeNpc -= NpcHooks_OnStrikeNpc;
WorldHooks.SaveWorld -= OnSaveWorld;
} }
/// <summary> /// <summary>
@ -297,6 +295,8 @@ namespace TShockAPI
private void OnLeave(int ply) private void OnLeave(int ply)
{ {
var tsplr = Players[ply]; var tsplr = Players[ply];
Players[ply] = null;
if (tsplr != null && tsplr.ReceivedInfo) if (tsplr != null && tsplr.ReceivedInfo)
{ {
Log.Info(string.Format("{0} left.", tsplr.Name)); Log.Info(string.Format("{0} left.", tsplr.Name));
@ -309,8 +309,6 @@ namespace TShockAPI
RemeberedPosManager.WriteSettings(); RemeberedPosManager.WriteSettings();
} }
} }
Players[ply] = null;
} }
private void OnChat(messageBuffer msg, int ply, string text, HandledEventArgs e) private void OnChat(messageBuffer msg, int ply, string text, HandledEventArgs e)