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

Added null checks

Browse source
This commit is contained in:
high 2011-07-01 10:31:54 -04:00
parent bfd8ed5685
commit 55fb103630
2 changed files with 42 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/TSPlayer.cs
View file

@ -140,7 +140,7 @@ namespace TShockAPI
public bool Teleport(int tileX, int tileY) public bool Teleport(int tileX, int tileY)
{ {
this.InitSpawn = false; InitSpawn = false;
int spawnTileX = Main.spawnTileX; int spawnTileX = Main.spawnTileX;
int spawnTileY = Main.spawnTileY; int spawnTileY = Main.spawnTileY;
Main.spawnTileX = tileX; Main.spawnTileX = tileX;

77
TShockAPI/TShock.cs
View file

@ -244,9 +244,6 @@ namespace TShockAPI
private void OnJoin(int ply, HandledEventArgs handler) private void OnJoin(int ply, HandledEventArgs handler)
{ {
if (Main.netMode != 2 || handler.Handled)
return;
var player = new TSPlayer(ply); var player = new TSPlayer(ply);
player.Group = Tools.GetGroupForIP(player.IP); player.Group = Tools.GetGroupForIP(player.IP);
@ -254,41 +251,42 @@ namespace TShockAPI
{ {
Tools.ForceKick(player, "Server is full"); Tools.ForceKick(player, "Server is full");
handler.Handled = true; handler.Handled = true;
return;
} }
else
var ban = Bans.GetBanByIp(player.IP);
if (ban != null)
{ {
var ban = Bans.GetBanByIp(player.IP); Tools.ForceKick(player, string.Format("You are banned: {0}", ban.Reason));
if (ban != null) handler.Handled = true;
{ return;
Tools.ForceKick(player, string.Format("You are banned: {0}", ban.Reason)); }
handler.Handled = true; if (!FileTools.OnWhitelist(player.IP))
} {
else if (!FileTools.OnWhitelist(player.IP)) Tools.ForceKick(player, "Not on whitelist.");
{ handler.Handled = true;
Tools.ForceKick(player, "Not on whitelist."); return;
handler.Handled = true;
}
} }
Players[ply] = player; Players[ply] = player;
Players[ply].InitSpawn = false;
Netplay.spamCheck = ConfigurationManager.SpamChecks; Netplay.spamCheck = ConfigurationManager.SpamChecks;
} }
private void OnLeave(int ply) private void OnLeave(int ply)
{ {
if (Main.netMode != 2)
return;
var tsplr = Players[ply]; var tsplr = Players[ply];
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));
if (ConfigurationManager.RememberLeavePos) if (ConfigurationManager.RememberLeavePos)
{ {
RemeberedPosManager.RemeberedPosistions.Add(new RemeberedPos(Players[ply].IP, new Vector2(Players[ply].X / 16, (Players[ply].Y / 16) + 3))); RemeberedPosManager.RemeberedPosistions.Add(new RemeberedPos(tsplr.IP,
RemeberedPosManager.WriteSettings(); new Vector2(tsplr.X / 16,
(tsplr.Y / 16) + 3)));
RemeberedPosManager.WriteSettings();
}
} }
Players[ply] = null; Players[ply] = null;
@ -296,14 +294,16 @@ namespace TShockAPI
private void OnChat(messageBuffer msg, int ply, string text, HandledEventArgs e) private void OnChat(messageBuffer msg, int ply, string text, HandledEventArgs e)
{ {
if (Main.netMode != 2 || e.Handled)
return;
var tsplr = Players[msg.whoAmI]; var tsplr = Players[msg.whoAmI];
if (tsplr == null)
if (msg.whoAmI != ply || tsplr == null)
{ {
e.Handled = Tools.HandleGriefer(Players[ply], "Faking Chat"); e.Handled = true;
return;
}
if (msg.whoAmI != ply)
{
e.Handled = Tools.HandleGriefer(tsplr, "Faking Chat");
return; return;
} }
@ -391,11 +391,13 @@ namespace TShockAPI
private void GetData(GetDataEventArgs e) private void GetData(GetDataEventArgs e)
{ {
if (Main.netMode != 2 || e.Handled)
return;
PacketTypes type = e.MsgID; PacketTypes type = e.MsgID;
TSPlayer player = Players[e.Msg.whoAmI]; var player = Players[e.Msg.whoAmI];
if (player == null)
{
e.Handled = true;
return;
}
if (!player.ConnectionAlive) if (!player.ConnectionAlive)
{ {
@ -431,10 +433,13 @@ namespace TShockAPI
private void OnGreetPlayer(int who, HandledEventArgs e) private void OnGreetPlayer(int who, HandledEventArgs e)
{ {
if (Main.netMode != 2 || e.Handled) var player = Players[who];
if (player == null)
{
e.Handled = true;
return; return;
}
TSPlayer player = Players[who];
Log.Info(string.Format("{0} ({1}) from '{2}' group joined.", player.Name, player.IP, player.Group.Name)); Log.Info(string.Format("{0} ({1}) from '{2}' group joined.", player.Name, player.IP, player.Group.Name));
Tools.ShowFileToUser(player, "motd.txt"); Tools.ShowFileToUser(player, "motd.txt");
@ -446,7 +451,7 @@ namespace TShockAPI
{ {
player.SetPvP(true); player.SetPvP(true);
} }
if (Players[who].Group.HasPermission("causeevents") && ConfigurationManager.InfiniteInvasion) if (player.Group.HasPermission("causeevents") && ConfigurationManager.InfiniteInvasion)
{ {
StartInvasion(); StartInvasion();
} }