Fix permission ordering in world plugin

vexyl · Aug 7, 2018 · 816c154 · 816c154
1 parent 8a4efcc
commit 816c154
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/plugins/core/permissions.lua b/plugins/core/permissions.lua
@@ -186,7 +186,7 @@ end
 
 PermissionsPlugin.RequirePermission = function(permission)
 	table.insert(PermissionsPlugin.permissionList, permission)
-	print("PermissionsPlugin new permission: " .. permission)
+	Server.LogDebug("PermissionsPlugin new permission: " .. permission)
 end
 
 PermissionsPlugin.PermissionExists = function(permission)

diff --git a/plugins/essentials/ban.lua b/plugins/essentials/ban.lua
@@ -130,7 +130,7 @@ EssentialsPlugin.Ban_OnConnect = function(client, args)
 		end
 
 		Server.KickClient(client, message)
-		print("Ban plugin prevented player " .. name .. " from joining.")
+		Server.LogDebug("Ban plugin prevented player " .. name .. " from joining.")
 		Flags.NoDefaultCall = 1
 	end
 end

diff --git a/plugins/essentials/groups.lua b/plugins/essentials/groups.lua
@@ -21,6 +21,11 @@ EssentialsPlugin.Groups_GroupsCommand_Reload = function(client, args)
 	EssentialsPlugin.Groups_LoadGroups()
 
 	Server.SendMessage(client, "&eReloaded groups")
+
+	-- hack to reload current players
+	for _,v in pairs(Server.GetClients()) do
+		EssentialsPlugin.Groups_OnAuth(v, nil)
+	end
 end
 
 EssentialsPlugin.Groups_OnAuth = function(client, args)

diff --git a/plugins/essentials/world.lua b/plugins/essentials/world.lua
@@ -23,8 +23,8 @@ Init = function()
 end,
 
 HasWorldPermission = function(client)
-	return PermissionsPlugin.CheckPermissionNotify(client, client:GetWorld():GetName() .. ".admin")
-		or PermissionsPlugin.CheckPermissionIfExists(client.name, "essentials.world")
+	return PermissionsPlugin.CheckPermissionIfExists(client.name, "essentials.world")
+		or PermissionsPlugin.CheckPermissionNotify(client, client:GetWorld():GetName() .. ".admin")
 end,
 
 Event_OnBlock = function(client, block)