fix: fixes server sided permissions so it checks the parent permissions

RickyB505 · RickyB505 · commit 95003dbb2563 · 2026-04-21T16:49:34.000-04:00
diff --git a/SharedClasses/PermissionsManager.cs b/SharedClasses/PermissionsManager.cs
@@ -482,8 +482,7 @@ private static bool IsAllowedServer(Permission permission, string playerHandle)
             {
                 return false;
             }
-
-            return IsPlayerAceAllowed(playerHandle, GetAceName(permission));
+            return GetPermissionAndParentPermissions(permission).Any(p => IsPlayerAceAllowed(playerHandle, GetAceName(p)));
         }
 #endif
 
diff --git a/SharedClasses/SupplementaryPermissionManager.cs b/SharedClasses/SupplementaryPermissionManager.cs
@@ -124,7 +124,7 @@ private static bool IsAllowedServer(string permission, string playerHandle)
                 return false;
             }
 
-            return IsPlayerAceAllowed(playerHandle, GetAceName(permission));
+            return GetPermissionAndParentPermissions(permission).Any(p => IsPlayerAceAllowed(playerHandle, GetAceName(p)));
         }
 #endif
 
diff --git a/vMenuServer/MainServer.cs b/vMenuServer/MainServer.cs
@@ -547,7 +547,7 @@ internal void ServerCommandHandler(int source, List<object> args, string _)
         [EventHandler("vMenu:GetOutOfCar")]
         internal void GetOutOfCar([FromSource] Player source, int vehicleNetId)
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.PVKickPassengers, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.PVAll, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.PVKickPassengers, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -726,7 +726,7 @@ private void RefreshWeather()
         [EventHandler("vMenu:UpdateServerWeather")]
         internal void UpdateWeather([FromSource] Player source, string newWeather, bool dynamicWeatherNew, bool enableSnow)
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOSetWeather, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.WOAll, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOSetWeather, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -750,7 +750,7 @@ internal void UpdateWeather([FromSource] Player source, string newWeather, bool
         [EventHandler("vMenu:UpdateServerBlackout")]
         internal void UpdateBlackout([FromSource] Player source, bool value)
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOBlackout, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.WOAll, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOBlackout, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -762,7 +762,7 @@ internal void UpdateBlackout([FromSource] Player source, bool value)
         [EventHandler("vMenu:UpdateServerVehicleBlackout")]
         internal void UpdateVehicleBlackout([FromSource] Player source, bool value)
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOVehBlackout, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.WOAll, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOVehBlackout, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -778,11 +778,10 @@ internal void UpdateVehicleBlackout([FromSource] Player source, bool value)
         [EventHandler("vMenu:UpdateServerWeatherCloudsType")]
         internal void UpdateWeatherCloudsType([FromSource] Player source, bool removeClouds)
         {
-            bool allWOPermissions = PermissionsManager.IsAllowed(PermissionsManager.Permission.WOAll, source);
 
             if (removeClouds)
             {
-                if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WORemoveClouds, source) && !allWOPermissions)
+                if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WORemoveClouds, source))
                 {
                     BanManager.BanCheater(source);
                     return;
@@ -792,7 +791,7 @@ internal void UpdateWeatherCloudsType([FromSource] Player source, bool removeClo
             }
             else
             {
-                if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WORandomizeClouds, source) && !allWOPermissions)
+                if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WORandomizeClouds, source))
                 {
                     BanManager.BanCheater(source);
                     return;
@@ -813,7 +812,7 @@ internal void UpdateWeatherCloudsType([FromSource] Player source, bool removeClo
         [EventHandler("vMenu:UpdateServerTime")]
         internal async void UpdateTime([FromSource] Player source, int newHours, int newMinutes, bool newFreezeTime)
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.TOSetTime, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.TOAll, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.Everything, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.TOSetTime, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -858,7 +857,7 @@ internal async void UpdateTime([FromSource] Player source, int newHours, int new
         [EventHandler("vMenu:FreezeServerTime")]
         internal void FreezeServerTime([FromSource] Player source, bool freezeTime)
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.TOFreezeTime, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.TOAll, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.Everything, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.TOFreezeTime, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -878,7 +877,7 @@ internal void FreezeServerTime([FromSource] Player source, bool freezeTime)
         [EventHandler("vMenu:KickPlayer")]
         internal void KickPlayer([FromSource] Player source, int target, string kickReason = "You have been kicked from the server.")
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPKick, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPKick, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -913,7 +912,7 @@ internal void KickPlayer([FromSource] Player source, int target, string kickReas
         [EventHandler("vMenu:KillPlayer")]
         internal void KillPlayer([FromSource] Player source, int target)
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPKill, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPKill, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -937,7 +936,7 @@ internal void KillPlayer([FromSource] Player source, int target)
         [EventHandler("vMenu:SummonPlayer")]
         internal async void SummonPlayer([FromSource] Player source, int target, int numberOfSeats)
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSummon, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSummon, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -1015,7 +1014,7 @@ internal async void SummonPlayer([FromSource] Player source, int target, int num
         [EventHandler("vMenu:SendMessageToPlayer")]
         internal void SendPrivateMessage([FromSource] Player source, int target, string message)
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSendMessage, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSendMessage, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -1049,7 +1048,7 @@ internal void SendPrivateMessage([FromSource] Player source, int target, string
 
             foreach (string playerHandle in joinedPlayers)
             {
-                if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSeePrivateMessages, playerHandle) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, playerHandle))
+                if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSeePrivateMessages, playerHandle))
                 {
                     continue;
                 }
@@ -1091,7 +1090,7 @@ private static void KickLog(string kickLogMesage)
         [EventHandler("vMenu:SaveTeleportLocation")]
         internal void AddTeleportLocation([FromSource] Player source, string locationJson)
         {
-            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.MSTeleportSaveLocation, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.MSAll, source))
+            if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.MSTeleportSaveLocation, source))
             {
                 BanManager.BanCheater(source);
                 return;
@@ -1141,7 +1140,7 @@ internal void GetPlayerCoords([FromSource] Player source, long rpcId, int player
         {
             var coords = Vector3.Zero;
 
-            if (PermissionsManager.IsAllowed(PermissionsManager.Permission.OPTeleport, source) || PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))
+            if (PermissionsManager.IsAllowed(PermissionsManager.Permission.OPTeleport, source))
             {
                 Player targetPlayer = GetPlayerFromServerId(playerId);
 
@@ -1169,7 +1168,7 @@ private IEnumerable<Player> GetJoinQuitNotifPlayers()
 
             foreach (string playerHandle in joinedPlayers)
             {
-                if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.MSJoinQuitNotifs, playerHandle) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.MSAll, playerHandle))
+                if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.MSJoinQuitNotifs, playerHandle))
                 {
                     continue;
                 }

Original file line number	Diff line number	Diff line change
`@@ -482,8 +482,7 @@ private static bool IsAllowedServer(Permission permission, string playerHandle)`
`482`	`482`	`{`
`483`	`483`	`return false;`
`484`	`484`	`}`
`485`		`-`
`486`		`- return IsPlayerAceAllowed(playerHandle, GetAceName(permission));`
	`485`	`+ return GetPermissionAndParentPermissions(permission).Any(p => IsPlayerAceAllowed(playerHandle, GetAceName(p)));`
`487`	`486`	`}`
`488`	`487`	`#endif`
`489`	`488`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ private static bool IsAllowedServer(string permission, string playerHandle)`
`124`	`124`	`return false;`
`125`	`125`	`}`
`126`	`126`
`127`		`- return IsPlayerAceAllowed(playerHandle, GetAceName(permission));`
	`127`	`+ return GetPermissionAndParentPermissions(permission).Any(p => IsPlayerAceAllowed(playerHandle, GetAceName(p)));`
`128`	`128`	`}`
`129`	`129`	`#endif`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ internal void ServerCommandHandler(int source, List<object> args, string _)`
`547`	`547`	`[EventHandler("vMenu:GetOutOfCar")]`
`548`	`548`	`internal void GetOutOfCar([FromSource] Player source, int vehicleNetId)`
`549`	`549`	`{`
`550`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.PVKickPassengers, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.PVAll, source))`
	`550`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.PVKickPassengers, source))`
`551`	`551`	`{`
`552`	`552`	`BanManager.BanCheater(source);`
`553`	`553`	`return;`
`@@ -726,7 +726,7 @@ private void RefreshWeather()`
`726`	`726`	`[EventHandler("vMenu:UpdateServerWeather")]`
`727`	`727`	`internal void UpdateWeather([FromSource] Player source, string newWeather, bool dynamicWeatherNew, bool enableSnow)`
`728`	`728`	`{`
`729`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOSetWeather, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.WOAll, source))`
	`729`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOSetWeather, source))`
`730`	`730`	`{`
`731`	`731`	`BanManager.BanCheater(source);`
`732`	`732`	`return;`
`@@ -750,7 +750,7 @@ internal void UpdateWeather([FromSource] Player source, string newWeather, bool`
`750`	`750`	`[EventHandler("vMenu:UpdateServerBlackout")]`
`751`	`751`	`internal void UpdateBlackout([FromSource] Player source, bool value)`
`752`	`752`	`{`
`753`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOBlackout, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.WOAll, source))`
	`753`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOBlackout, source))`
`754`	`754`	`{`
`755`	`755`	`BanManager.BanCheater(source);`
`756`	`756`	`return;`
`@@ -762,7 +762,7 @@ internal void UpdateBlackout([FromSource] Player source, bool value)`
`762`	`762`	`[EventHandler("vMenu:UpdateServerVehicleBlackout")]`
`763`	`763`	`internal void UpdateVehicleBlackout([FromSource] Player source, bool value)`
`764`	`764`	`{`
`765`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOVehBlackout, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.WOAll, source))`
	`765`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WOVehBlackout, source))`
`766`	`766`	`{`
`767`	`767`	`BanManager.BanCheater(source);`
`768`	`768`	`return;`
`@@ -778,11 +778,10 @@ internal void UpdateVehicleBlackout([FromSource] Player source, bool value)`
`778`	`778`	`[EventHandler("vMenu:UpdateServerWeatherCloudsType")]`
`779`	`779`	`internal void UpdateWeatherCloudsType([FromSource] Player source, bool removeClouds)`
`780`	`780`	`{`
`781`		`- bool allWOPermissions = PermissionsManager.IsAllowed(PermissionsManager.Permission.WOAll, source);`
`782`	`781`
`783`	`782`	`if (removeClouds)`
`784`	`783`	`{`
`785`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WORemoveClouds, source) && !allWOPermissions)`
	`784`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WORemoveClouds, source))`
`786`	`785`	`{`
`787`	`786`	`BanManager.BanCheater(source);`
`788`	`787`	`return;`
`@@ -792,7 +791,7 @@ internal void UpdateWeatherCloudsType([FromSource] Player source, bool removeClo`
`792`	`791`	`}`
`793`	`792`	`else`
`794`	`793`	`{`
`795`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WORandomizeClouds, source) && !allWOPermissions)`
	`794`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.WORandomizeClouds, source))`
`796`	`795`	`{`
`797`	`796`	`BanManager.BanCheater(source);`
`798`	`797`	`return;`
`@@ -813,7 +812,7 @@ internal void UpdateWeatherCloudsType([FromSource] Player source, bool removeClo`
`813`	`812`	`[EventHandler("vMenu:UpdateServerTime")]`
`814`	`813`	`internal async void UpdateTime([FromSource] Player source, int newHours, int newMinutes, bool newFreezeTime)`
`815`	`814`	`{`
`816`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.TOSetTime, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.TOAll, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.Everything, source))`
	`815`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.TOSetTime, source))`
`817`	`816`	`{`
`818`	`817`	`BanManager.BanCheater(source);`
`819`	`818`	`return;`
`@@ -858,7 +857,7 @@ internal async void UpdateTime([FromSource] Player source, int newHours, int new`
`858`	`857`	`[EventHandler("vMenu:FreezeServerTime")]`
`859`	`858`	`internal void FreezeServerTime([FromSource] Player source, bool freezeTime)`
`860`	`859`	`{`
`861`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.TOFreezeTime, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.TOAll, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.Everything, source))`
	`860`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.TOFreezeTime, source))`
`862`	`861`	`{`
`863`	`862`	`BanManager.BanCheater(source);`
`864`	`863`	`return;`
`@@ -878,7 +877,7 @@ internal void FreezeServerTime([FromSource] Player source, bool freezeTime)`
`878`	`877`	`[EventHandler("vMenu:KickPlayer")]`
`879`	`878`	`internal void KickPlayer([FromSource] Player source, int target, string kickReason = "You have been kicked from the server.")`
`880`	`879`	`{`
`881`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPKick, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))`
	`880`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPKick, source))`
`882`	`881`	`{`
`883`	`882`	`BanManager.BanCheater(source);`
`884`	`883`	`return;`
`@@ -913,7 +912,7 @@ internal void KickPlayer([FromSource] Player source, int target, string kickReas`
`913`	`912`	`[EventHandler("vMenu:KillPlayer")]`
`914`	`913`	`internal void KillPlayer([FromSource] Player source, int target)`
`915`	`914`	`{`
`916`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPKill, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))`
	`915`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPKill, source))`
`917`	`916`	`{`
`918`	`917`	`BanManager.BanCheater(source);`
`919`	`918`	`return;`
`@@ -937,7 +936,7 @@ internal void KillPlayer([FromSource] Player source, int target)`
`937`	`936`	`[EventHandler("vMenu:SummonPlayer")]`
`938`	`937`	`internal async void SummonPlayer([FromSource] Player source, int target, int numberOfSeats)`
`939`	`938`	`{`
`940`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSummon, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))`
	`939`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSummon, source))`
`941`	`940`	`{`
`942`	`941`	`BanManager.BanCheater(source);`
`943`	`942`	`return;`
`@@ -1015,7 +1014,7 @@ internal async void SummonPlayer([FromSource] Player source, int target, int num`
`1015`	`1014`	`[EventHandler("vMenu:SendMessageToPlayer")]`
`1016`	`1015`	`internal void SendPrivateMessage([FromSource] Player source, int target, string message)`
`1017`	`1016`	`{`
`1018`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSendMessage, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))`
	`1017`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSendMessage, source))`
`1019`	`1018`	`{`
`1020`	`1019`	`BanManager.BanCheater(source);`
`1021`	`1020`	`return;`
`@@ -1049,7 +1048,7 @@ internal void SendPrivateMessage([FromSource] Player source, int target, string`
`1049`	`1048`
`1050`	`1049`	`foreach (string playerHandle in joinedPlayers)`
`1051`	`1050`	`{`
`1052`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSeePrivateMessages, playerHandle) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, playerHandle))`
	`1051`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.OPSeePrivateMessages, playerHandle))`
`1053`	`1052`	`{`
`1054`	`1053`	`continue;`
`1055`	`1054`	`}`
`@@ -1091,7 +1090,7 @@ private static void KickLog(string kickLogMesage)`
`1091`	`1090`	`[EventHandler("vMenu:SaveTeleportLocation")]`
`1092`	`1091`	`internal void AddTeleportLocation([FromSource] Player source, string locationJson)`
`1093`	`1092`	`{`
`1094`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.MSTeleportSaveLocation, source) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.MSAll, source))`
	`1093`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.MSTeleportSaveLocation, source))`
`1095`	`1094`	`{`
`1096`	`1095`	`BanManager.BanCheater(source);`
`1097`	`1096`	`return;`
`@@ -1141,7 +1140,7 @@ internal void GetPlayerCoords([FromSource] Player source, long rpcId, int player`
`1141`	`1140`	`{`
`1142`	`1141`	`var coords = Vector3.Zero;`
`1143`	`1142`
`1144`		`- if (PermissionsManager.IsAllowed(PermissionsManager.Permission.OPTeleport, source) \|\| PermissionsManager.IsAllowed(PermissionsManager.Permission.OPAll, source))`
	`1143`	`+ if (PermissionsManager.IsAllowed(PermissionsManager.Permission.OPTeleport, source))`
`1145`	`1144`	`{`
`1146`	`1145`	`Player targetPlayer = GetPlayerFromServerId(playerId);`
`1147`	`1146`
`@@ -1169,7 +1168,7 @@ private IEnumerable<Player> GetJoinQuitNotifPlayers()`
`1169`	`1168`
`1170`	`1169`	`foreach (string playerHandle in joinedPlayers)`
`1171`	`1170`	`{`
`1172`		`- if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.MSJoinQuitNotifs, playerHandle) && !PermissionsManager.IsAllowed(PermissionsManager.Permission.MSAll, playerHandle))`
	`1171`	`+ if (!PermissionsManager.IsAllowed(PermissionsManager.Permission.MSJoinQuitNotifs, playerHandle))`
`1173`	`1172`	`{`
`1174`	`1173`	`continue;`
`1175`	`1174`	`}`