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

Fixed Ban not checking socket status correctly.

Browse source 
Fixed unban/unbanip for real this time
This commit is contained in:
high 2011-06-08 06:44:53 -04:00
parent d23db067e9
commit e66c57450a
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Commands.cs
View file

@ -279,7 +279,7 @@ namespace TShockAPI
public static void UnBan(CommandArgs args) public static void UnBan(CommandArgs args)
{ {
string plStr = args.Message.Remove(0, 6); string plStr = args.Message.Remove(0, 7);
int adminplr = args.PlayerID; int adminplr = args.PlayerID;
var ban = TShock.Bans.GetBanByName(plStr); var ban = TShock.Bans.GetBanByName(plStr);
if (ban != null) if (ban != null)
@ -295,7 +295,7 @@ namespace TShockAPI
public static void UnBanIP(CommandArgs args) public static void UnBanIP(CommandArgs args)
{ {
string plStr = args.Message.Remove(0, 8); string plStr = args.Message.Remove(0, 9);
int adminplr = args.PlayerID; int adminplr = args.PlayerID;
var ban = TShock.Bans.GetBanByIp(plStr); var ban = TShock.Bans.GetBanByIp(plStr);
if (ban != null) if (ban != null)

5
TShockAPI/Tools.cs
View file

@ -249,13 +249,14 @@ namespace TShockAPI
/// <param name="reason">string reason</param> /// <param name="reason">string reason</param>
public static bool Ban(int plr, string reason, string adminUserName = "") public static bool Ban(int plr, string reason, string adminUserName = "")
{ {
if (!Netplay.serverSock[plr].active || Netplay.serverSock[plr].kill)
return true;
if (!TShock.players[plr].group.HasPermission("immunetoban")) if (!TShock.players[plr].group.HasPermission("immunetoban"))
{ {
string ip = GetPlayerIP(plr); string ip = GetPlayerIP(plr);
string playerName = Main.player[plr].name; string playerName = Main.player[plr].name;
TShock.Bans.AddBan(ip, playerName, reason); TShock.Bans.AddBan(ip, playerName, reason);
if (Main.player[plr].active || !Netplay.serverSock[plr].kill) NetMessage.SendData(0x2, plr, -1, "Banned: " + reason, 0x0, 0f, 0f, 0f);
NetMessage.SendData(0x2, plr, -1, "Banned: " + reason, 0x0, 0f, 0f, 0f);
Log.Info("Banned " + playerName + " for : " + reason); Log.Info("Banned " + playerName + " for : " + reason);
if (adminUserName.Length == 0) if (adminUserName.Length == 0)
Broadcast(playerName + " was banned for " + reason.ToLower()); Broadcast(playerName + " was banned for " + reason.ToLower());