From 1b8e48b5bff876638a96f38710e1d2e117cf05da Mon Sep 17 00:00:00 2001 From: high Date: Sat, 31 Dec 2011 23:05:54 -0500 Subject: [PATCH] Fixed args.Player.Group being used before being set --- TShockAPI/GetDataHandlers.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index a98b8f22..4ec6e7c8 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -618,9 +618,11 @@ namespace TShockAPI args.Player.State = 2; NetMessage.SendData((int) PacketTypes.WorldInfo, args.Player.Index); + var group = TShock.Utils.GetGroup(user.Group); + if (TShock.Config.ServerSideInventory) { - if (args.Player.Group.HasPermission(Permissions.bypassinventorychecks)) + if (group.HasPermission(Permissions.bypassinventorychecks)) { args.Player.IgnoreActionsForClearingTrashCan = false; } @@ -632,13 +634,13 @@ namespace TShockAPI } } - if (args.Player.Group.HasPermission(Permissions.ignorestackhackdetection)) + if (group.HasPermission(Permissions.ignorestackhackdetection)) args.Player.IgnoreActionsForCheating = "none"; - if (args.Player.Group.HasPermission(Permissions.usebanneditem)) + if (group.HasPermission(Permissions.usebanneditem)) args.Player.IgnoreActionsForDisabledArmor = "none"; - args.Player.Group = TShock.Utils.GetGroup(user.Group); + args.Player.Group = group; args.Player.UserAccountName = args.Player.Name; args.Player.UserID = TShock.Users.GetUserID(args.Player.UserAccountName); args.Player.IsLoggedIn = true;