From 339e12dd0caa5d9a6b94dd66982eadadea3c48ce Mon Sep 17 00:00:00 2001 From: Sekwah Date: Mon, 23 Jul 2018 01:14:36 +0100 Subject: [PATCH] Updated op code --- .../ForgeCommandSenderContainer.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/sekwah/advancedportals/forge/coreconnector/container/ForgeCommandSenderContainer.java b/src/main/java/com/sekwah/advancedportals/forge/coreconnector/container/ForgeCommandSenderContainer.java index 52b91bc..eeaa999 100644 --- a/src/main/java/com/sekwah/advancedportals/forge/coreconnector/container/ForgeCommandSenderContainer.java +++ b/src/main/java/com/sekwah/advancedportals/forge/coreconnector/container/ForgeCommandSenderContainer.java @@ -24,19 +24,19 @@ public class ForgeCommandSenderContainer implements CommandSenderContainer { public boolean isOp() { if(this.sender.getCommandSenderEntity() instanceof EntityPlayer) { - if(!FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().canSendCommands(((EntityPlayer) this.sender).getGameProfile())) { - return false; - } - else { - UserListOpsEntry userlistopsentry = FMLCommonHandler.instance().getMinecraftServerInstance() - .getPlayerList().getOppedPlayers().getEntry(((EntityPlayer) this.sender).getGameProfile()); - if (userlistopsentry != null) { - return userlistopsentry.getPermissionLevel() >= 2; - } else { - return FMLCommonHandler.instance().getMinecraftServerInstance().getOpPermissionLevel() - >= 2; + if(!FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().canSendCommands(((EntityPlayer) this.sender).getGameProfile())) { + return false; + } + else { + UserListOpsEntry userlistopsentry = FMLCommonHandler.instance().getMinecraftServerInstance() + .getPlayerList().getOppedPlayers().getEntry(((EntityPlayer) this.sender).getGameProfile()); + // Intellij may say this will always be true but it isn't + if (userlistopsentry != null) { + return userlistopsentry.getPermissionLevel() >= 2; + } else { + return FMLCommonHandler.instance().getMinecraftServerInstance().getOpPermissionLevel() >= 2; + } } - } } else {