diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java b/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java index f210e89..b131dbb 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandAddPrivileged.java @@ -39,7 +39,7 @@ public class CommandAddPrivileged extends CommandBase implements IOpisCommand{ if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isAdmin(((EntityPlayerMP)sender).getGameProfile().getName()); + return PlayerTracker.INSTANCE.isAdmin((EntityPlayerMP)sender); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java b/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java index bf172ba..80b2c40 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandEntityCreate.java @@ -48,7 +48,7 @@ public class CommandEntityCreate extends CommandBase { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); + return PlayerTracker.INSTANCE.isPrivileged((EntityPlayerMP)sender); } } diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java b/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java index 4cc954d..498e271 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandFrequency.java @@ -50,7 +50,7 @@ public class CommandFrequency extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); + return PlayerTracker.INSTANCE.isPrivileged((EntityPlayerMP)sender); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java b/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java index d7d7ca5..920bf8a 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandKill.java @@ -64,7 +64,7 @@ public class CommandKill extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); + return PlayerTracker.INSTANCE.isPrivileged((EntityPlayerMP)sender); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java b/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java index 143424b..20b86e1 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandKillAll.java @@ -87,7 +87,7 @@ public class CommandKillAll extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); + return PlayerTracker.INSTANCE.isPrivileged((EntityPlayerMP)sender); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java index 300db24..71532ec 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandReset.java @@ -58,7 +58,7 @@ public class CommandReset extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); + return PlayerTracker.INSTANCE.isPrivileged((EntityPlayerMP)sender); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java b/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java index 6ef3dfc..24e5cb8 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandRmPrivileged.java @@ -22,7 +22,7 @@ public class CommandRmPrivileged extends CommandBase implements IOpisCommand{ @Override public void processCommand(ICommandSender icommandsender, String[] astring) { - if (PlayerTracker.INSTANCE.isPrivileged(astring[0])){ + if (PlayerTracker.INSTANCE.isInPrivilegedList(astring[0])){ PlayerTracker.INSTANCE.rmPrivilegedPlayer(astring[0]); icommandsender.addChatMessage(new ChatComponentText(String.format("Player %s removed from Opis user list.", astring[0]))); } else { @@ -42,7 +42,7 @@ public class CommandRmPrivileged extends CommandBase implements IOpisCommand{ if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isAdmin(((EntityPlayerMP)sender).getGameProfile().getName()); + return PlayerTracker.INSTANCE.isAdmin((EntityPlayerMP)sender); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java b/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java index 9d3432d..cb6b928 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandStop.java @@ -50,7 +50,7 @@ public class CommandStop extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); + return PlayerTracker.INSTANCE.isPrivileged((EntityPlayerMP)sender); } @Override diff --git a/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java b/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java index 95ca9c8..e19bbbe 100644 --- a/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java +++ b/src/main/java/mcp/mobius/opis/commands/server/CommandTicks.java @@ -50,7 +50,7 @@ public class CommandTicks extends CommandBase implements IOpisCommand { if (sender instanceof DedicatedServer) return true; //if ((sender instanceof EntityPlayerMP) && ((EntityPlayerMP)sender).playerNetServerHandler.netManager instanceof MemoryConnection) return true; if (!(sender instanceof DedicatedServer) && !(sender instanceof EntityPlayerMP)) return true; - return PlayerTracker.INSTANCE.isPrivileged(((EntityPlayerMP)sender).getGameProfile().getName()); + return PlayerTracker.INSTANCE.isPrivileged((EntityPlayerMP)sender); } @Override diff --git a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java index 921b503..185c730 100644 --- a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java +++ b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java @@ -15,9 +15,11 @@ import mcp.mobius.opis.network.PacketManager; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataValue; +import mcp.mobius.opis.network.rconserver.RConServer; import mcp.mobius.opis.swing.SelectedTab; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; +import net.minecraftforge.common.util.FakePlayer; //public class PlayerTracker implements IPlayerTracker{ public enum PlayerTracker{ @@ -38,17 +40,16 @@ public enum PlayerTracker{ } public AccessLevel getPlayerAccessLevel(EntityPlayerMP player){ + if (player instanceof FakePlayer && RConServer.instance.fakePlayers.containsKey(player)) + return AccessLevel.PRIVILEGED; + return this.getPlayerAccessLevel(player.getGameProfile().getName()); } public AccessLevel getPlayerAccessLevel(String name){ - //TODO : This should be made proper. Right now, this is a security risk with mods changing names. - //TODO : Maybe use uuid as a name and check here against the RconServer list of uuids ? - if (name.startsWith("RConInboundHandler")) - return AccessLevel.PRIVILEGED; - - GameProfile profile = MinecraftServer.getServer().getConfigurationManager().func_152612_a(name).getGameProfile(); + EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(name); + GameProfile profile = player.getGameProfile(); if (MinecraftServer.getServer().getConfigurationManager().func_152596_g(profile) || MinecraftServer.getServer().isSinglePlayer()) return AccessLevel.ADMIN; @@ -86,17 +87,14 @@ public enum PlayerTracker{ return this.getPlayerAccessLevel(player).ordinal() >= AccessLevel.ADMIN.ordinal(); } - public boolean isAdmin(String name){ - return this.getPlayerAccessLevel(name).ordinal() >= AccessLevel.ADMIN.ordinal(); - } - public boolean isPrivileged(EntityPlayerMP player){ return this.getPlayerAccessLevel(player).ordinal() >= AccessLevel.PRIVILEGED.ordinal(); } - public boolean isPrivileged(String name){ - return this.getPlayerAccessLevel(name).ordinal() >= AccessLevel.PRIVILEGED.ordinal(); - } + public boolean isInPrivilegedList(String name){ + return this.playerPrivileged.contains(name); + } + //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++// diff --git a/src/main/java/mcp/mobius/opis/network/enums/Message.java b/src/main/java/mcp/mobius/opis/network/enums/Message.java index afef066..6d43002 100644 --- a/src/main/java/mcp/mobius/opis/network/enums/Message.java +++ b/src/main/java/mcp/mobius/opis/network/enums/Message.java @@ -130,10 +130,6 @@ public enum Message { return PlayerTracker.INSTANCE.getPlayerAccessLevel(player).ordinal() >= this.accessLevel.ordinal(); } - public boolean canPlayerUseCommand(String name){ - return PlayerTracker.INSTANCE.getPlayerAccessLevel(name).ordinal() >= this.accessLevel.ordinal(); - } - public boolean isDisplayActive(SelectedTab tab){ if (this.tabEnum.contains(SelectedTab.ANY)) return true; if (this.tabEnum.contains(SelectedTab.NONE)) return false;