minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Fix OpenInv/OpenEnder permissions logic a little bit

Browse Source 
/openender should respect exempt and crossworld permissions
/openinv should allow opening of own inventory if exempt without override
This commit is contained in:
Jikoo
2016-11-25 22:26:25 -05:00
parent a10c61168a
commit d7eec528e4
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugin/src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java
View File

@@ -113,11 +113,20 @@ public class OpenEnderPluginCommand implements CommandExecutor {
onlineTarget = target.getPlayer(); onlineTarget = target.getPlayer();
} }
if (!onlineTarget.equals(player)) {
if (!onlineTarget.equals(player) && !Permissions.ENDERCHEST_ALL.hasPermission(player)) { if (!Permissions.ENDERCHEST_ALL.hasPermission(player)) {
player.sendMessage(ChatColor.RED + "You do not have permission to access other player's enderchest"); player.sendMessage(ChatColor.RED + "You do not have permission to access other players' enderchests.");
return; return;
} }
if (!Permissions.CROSSWORLD.hasPermission(player) && !player.getWorld().equals(onlineTarget.getWorld())) {
player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + " is not in your world!");
return;
}
if (!Permissions.OVERRIDE.hasPermission(player) && Permissions.EXEMPT.hasPermission(onlineTarget)) {
player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + "'s inventory is protected!");
return;
}
}
// Record the target // Record the target
openEnderHistory.put(player, onlineTarget.getName()); openEnderHistory.put(player, onlineTarget.getName());

15
plugin/src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java
View File

@@ -115,21 +115,24 @@ public class OpenInvPluginCommand implements CommandExecutor {
} }
// Permissions checks // Permissions checks
if (onlineTarget.equals(player)) {
// Self-open check
if (!Permissions.OPENSELF.hasPermission(player)) {
player.sendMessage(ChatColor.RED + "You're not allowed to openinv yourself.");
return;
}
} else {
// Protected check
if (!Permissions.OVERRIDE.hasPermission(player) && Permissions.EXEMPT.hasPermission(onlineTarget)) { if (!Permissions.OVERRIDE.hasPermission(player) && Permissions.EXEMPT.hasPermission(onlineTarget)) {
player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + "'s inventory is protected!"); player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + "'s inventory is protected!");
return; return;
} }
// Crosswork check // Crossworld check
if ((!Permissions.CROSSWORLD.hasPermission(player) && !Permissions.OVERRIDE.hasPermission(player)) && onlineTarget.getWorld() != player.getWorld()) { if ((!Permissions.CROSSWORLD.hasPermission(player) && !Permissions.OVERRIDE.hasPermission(player)) && onlineTarget.getWorld() != player.getWorld()) {
player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + " is not in your world!"); player.sendMessage(ChatColor.RED + onlineTarget.getDisplayName() + " is not in your world!");
return; return;
} }
// Self-open check
if (!Permissions.OPENSELF.hasPermission(player) && onlineTarget.equals(player)) {
player.sendMessage(ChatColor.RED + "You're not allowed to openinv yourself.");
return;
} }
// Record the target // Record the target