some changes

Ikos3k · Ikos3k · commit 01c9dd0b51d6 · 2021-05-28T22:22:15.000+02:00
diff --git a/src/main/java/me/ANONIMUS/proxy/BetterProxy.java b/src/main/java/me/ANONIMUS/proxy/BetterProxy.java
@@ -12,8 +12,8 @@
 import me.ANONIMUS.proxy.utils.FileUtil;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Timer;
 
 @Getter
@@ -24,10 +24,9 @@ public class BetterProxy {
     private final ConfigManager configManager;
     private final PlayerManager playerManager;
     private static BetterProxy instance;
-    private final List<Account> accounts;
+    private final Map<String, Account> accounts;
     private final ProxyServer server;
     private final File dirFolder;
-    private final String icon;
 
     public BetterProxy() {
         instance = this;
@@ -36,10 +35,9 @@ public BetterProxy() {
         packetRegistry = new PacketRegistry();
         exploitManager = new ExploitManager();
         configManager = new ConfigManager(new File(dirFolder + "/config.json"));
-        icon = FileUtil.loadIconFile(configManager.getConfig().icon);
         playerManager = new PlayerManager();
-        accounts = new ArrayList<>();
-        server = new ProxyServer();
+        accounts = new HashMap<>();
+        server = new ProxyServer(FileUtil.getIconFile(configManager.getConfig().icon));
     }
 
     public void run() {
@@ -60,7 +58,7 @@ public void run() {
         System.out.println("> Loading accounts...");
         FileUtil.loadAccounts();
         System.out.println("> Starting the server...");
-        server.bind();
+        server.bind(playerManager);
         System.out.println();
 
         final Timer timer = new Timer();
diff --git a/src/main/java/me/ANONIMUS/proxy/commands/admins/CommandKick.java b/src/main/java/me/ANONIMUS/proxy/commands/admins/CommandKick.java
@@ -25,7 +25,7 @@ public void onCommand(Player sender, String[] args) {
             return;
         }
 
-        if (sender.getAccount().getUsername().equals(args[1])) {
+        if (sender.getUsername().equals(args[1])) {
             ChatUtil.sendChatMessage("&cYou can't kick yourself out!", sender, true);
             return;
         }
diff --git a/src/main/java/me/ANONIMUS/proxy/commands/bots/CommandBotQuit.java b/src/main/java/me/ANONIMUS/proxy/commands/bots/CommandBotQuit.java
@@ -25,7 +25,7 @@ public void onCommand(Player sender, String[] args) {
         } else {
             Bot b = null;
             for (Bot bot : sender.getBots()) {
-                if (bot.getSession().getUsername().equals(args[1])) {
+                if (bot.getUsername().equals(args[1])) {
                     b = bot;
                 }
             }
diff --git a/src/main/java/me/ANONIMUS/proxy/commands/more/CommandSkin.java b/src/main/java/me/ANONIMUS/proxy/commands/more/CommandSkin.java
@@ -17,7 +17,7 @@ public void onCommand(Player sender, String[] args) {
         final String player = args[1];
 
         if (player.equalsIgnoreCase("default")) {
-            sender.setSkin(SkinUtil.getSkin(sender.getAccount().getUsername(), null));
+            sender.setSkin(SkinUtil.getSkin(sender.getUsername(), null));
             ChatUtil.sendChatMessage("&7Skin has been successfully reset", sender, true);
             ChatUtil.sendChatMessage("&cYou need to reconnect to the proxy!", sender, true);
             return;
diff --git a/src/main/java/me/ANONIMUS/proxy/commands/normal/CommandStay.java b/src/main/java/me/ANONIMUS/proxy/commands/normal/CommandStay.java
@@ -38,7 +38,7 @@ public void onCommand(Player sender, String[] args) {
         sender.getRemoteSession().getChannel().pipeline().replace("handler", "handler", new SimpleChannelInboundHandler<Packet>() {
             @Override
             public void channelInactive(ChannelHandlerContext ctx) {
-                ChatUtil.sendChatMessage(sender.getThemeType().getColor(1) + ">> &8Bot &c" + bot.getSession().getUsername() + " &8disconnected from the server &fcause: &c" + ctx.getClass(), bot.getOwner(), true);
+                ChatUtil.sendChatMessage(sender.getThemeType().getColor(1) + ">> &8Bot &c" + bot.getUsername() + " &8disconnected from the server &fcause: &c" + ctx.getClass(), bot.getOwner(), true);
                 disconnect(bot, sender);
             }
 
@@ -51,16 +51,16 @@ protected void channelRead0(ChannelHandlerContext channelHandlerContext, Packet
                 } else if (packet instanceof ServerKeepAlivePacket) {
                     bot.getSession().sendPacket(new ClientKeepAlivePacket(((ServerKeepAlivePacket) packet).getKeepaliveId()));
                 } else if (packet instanceof ServerJoinGamePacket) {
-                    ChatUtil.sendChatMessage(sender.getThemeType().getColor(1) + ">> &8Bot &a" + bot.getSession().getUsername() + " &8connected to the server", bot.getOwner(), true);
+                    ChatUtil.sendChatMessage(sender.getThemeType().getColor(1) + ">> &8Bot &a" + bot.getUsername() + " &8connected to the server", bot.getOwner(), true);
                     bot.getOwner().getBots().add(bot);
                     bot.getSession().sendPacket(new ClientCustomPayloadPacket("MC|Brand", "vanilla".getBytes()));
                     bot.getSession().sendPacket(new ClientSettingsPacket("pl_PL", (byte) 32, (byte) 0, false, (byte) 1));
                 } else if (packet instanceof ServerDisconnectPacket) {
-                    ChatUtil.sendChatMessage(sender.getThemeType().getColor(1) + ">> &8Bot &c" + bot.getSession().getUsername() + " &8disconnected from the server &fcause: &c" + ChatColor.stripColor(BaseComponent.toLegacyText(((ServerDisconnectPacket) packet).getReason())), bot.getOwner(), true);
+                    ChatUtil.sendChatMessage(sender.getThemeType().getColor(1) + ">> &8Bot &c" + bot.getUsername() + " &8disconnected from the server &fcause: &c" + ChatColor.stripColor(BaseComponent.toLegacyText(((ServerDisconnectPacket) packet).getReason())), bot.getOwner(), true);
                     disconnect(bot, sender);
 
                 } else if (packet instanceof ServerLoginDisconnectPacket) {
-                    ChatUtil.sendChatMessage(sender.getThemeType().getColor(1) + ">> &8Bot &c" + bot.getSession().getUsername() + " &8disconnected from the server &fause: &c" + ChatColor.stripColor(BaseComponent.toLegacyText(((ServerLoginDisconnectPacket) packet).getReason())), bot.getOwner(), true);
+                    ChatUtil.sendChatMessage(sender.getThemeType().getColor(1) + ">> &8Bot &c" + bot.getUsername() + " &8disconnected from the server &fause: &c" + ChatColor.stripColor(BaseComponent.toLegacyText(((ServerLoginDisconnectPacket) packet).getReason())), bot.getOwner(), true);
                     disconnect(bot, sender);
                 }
             }
diff --git a/src/main/java/me/ANONIMUS/proxy/enums/GroupType.java b/src/main/java/me/ANONIMUS/proxy/enums/GroupType.java
@@ -31,6 +31,6 @@ public int getDelayCMD() {
     }
 
     public static GroupType getByPermission(int permission) {
-        return Arrays.stream(GroupType.values()).filter(gp -> gp.permission == permission).findFirst().orElse(GroupType.USER);
+        return Arrays.stream(values()).filter(gp -> gp.permission == permission).findFirst().orElse(GroupType.USER);
     }
 }
diff --git a/src/main/java/me/ANONIMUS/proxy/exploits/ShitExploit.java b/src/main/java/me/ANONIMUS/proxy/exploits/ShitExploit.java
@@ -30,22 +30,22 @@ public void execute(Player sender, Object... objects) {
         ChatUtil.sendChatMessage(sender.getThemeType().getColor(1) + ">> &8Crashing complete &7(" + sender.getThemeType().getColor(2) + time2 + "ms&7)", sender, false);
     }
 
-    private String getCrashCommand(final int mode, final boolean fullCMD, final boolean bypass) {
+    private String getCrashCommand(final int mode, final boolean full, final boolean bypass) {
         switch (mode) {
             case 1: {
                 return (bypass ? "/worldedit:/" : "//") + "solve";
             }
             case 2: {
-                return (bypass ? "/worldedit:/" : "//") + (fullCMD ? "evaluate" : "eval");
+                return (bypass ? "/worldedit:/" : "//") + (full ? "evaluate" : "eval");
             }
             case 3: {
-                return (bypass ? "/worldedit:/" : "//") + (fullCMD ? "calculate" : "calc");
+                return (bypass ? "/worldedit:/" : "//") + (full ? "calculate" : "calc");
             }
             case 4: {
-                return (fullCMD ? (bypass ? "/permissionsex:pex " : "/pex ") : "/") + "demote a a";
+                return (full ? (bypass ? "/permissionsex:pex " : "/pex ") : "/") + "demote a a";
             }
             case 5: {
-                return (fullCMD ? (bypass ? "/permissionsex:pex " : "/pex ") : "/") + "promote a a";
+                return (full ? (bypass ? "/permissionsex:pex " : "/pex ") : "/") + "promote a a";
             }
             default:
                 return null;
diff --git a/src/main/java/me/ANONIMUS/proxy/handler/ServerHandler.java b/src/main/java/me/ANONIMUS/proxy/handler/ServerHandler.java
@@ -8,7 +8,7 @@
 public abstract class ServerHandler {
     public final Player player;
 
-    public abstract void disconnected();
+    public abstract void disconnect();
 
     public abstract void handlePacket(final Packet packet);
 }
diff --git a/src/main/java/me/ANONIMUS/proxy/handler/impl/ServerLoginHandler.java b/src/main/java/me/ANONIMUS/proxy/handler/impl/ServerLoginHandler.java
@@ -17,6 +17,7 @@
 import me.kbrewster.mojangapi.MojangAPI;
 
 import java.util.Arrays;
+import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -27,27 +28,27 @@ public ServerLoginHandler(Player player) {
     }
 
     @Override
-    public void disconnected() {
-        if (player != null && player.getAccount() != null) {
-            System.out.println("[" + player.getAccount().getUsername() + "] Disconnected during login sequence!");
-        }
+    public void disconnect() {
+        System.out.println("[" + player.getUsername() + "] Disconnected during login sequence!");
     }
 
     @SneakyThrows
     @Override
     public void handlePacket(Packet packet) {
         if (packet instanceof ClientLoginStartPacket) {
             final String playerName = ((ClientLoginStartPacket) packet).getUsername();
+            player.getSession().setUsername(playerName);
             if (BetterProxy.getInstance().getPlayerManager().getPlayers().size() > 1) {
                 for (Player p : BetterProxy.getInstance().getPlayerManager().getPlayers()) {
-                    if (p.getAccount() != null && p.getAccount().getUsername().equals(playerName)) {
+                    if (p.getAccount() != null && p.getUsername().equals(playerName)) {
                         player.getSession().sendPacket(new ServerLoginDisconnectPacket(ChatUtil.fixColor("&4The player with this nickname is already on the proxy!")));
                         return;
                     }
                 }
             }
-            for (Account account : BetterProxy.getInstance().getAccounts()) {
-                if (account.getUsername().equals(playerName)) {
+
+            for(Map.Entry<String, Account> account : BetterProxy.getInstance().getAccounts().entrySet()) {
+                if (account.getKey().equals(playerName)) {
                     UUID uuid;
                     try {
                         uuid = MojangAPI.getUUID(playerName);
@@ -60,13 +61,13 @@ public void handlePacket(Packet packet) {
                     player.getSession().sendPacket(new ServerLoginSuccessPacket(uuid, playerName));
                     player.getSession().setConnectionState(ConnectionState.PLAY);
                     player.getSession().setPacketHandler(new ServerPlayHandler(player));
-                    player.setAccount(account);
+                    player.setAccount(account.getValue());
                     player.loadOptions();
 
                     SkinUtil.showSkin(player.getSession(), uuid, player.getSkin());
 
                     WorldUtil.emptyWorld(player);
-                    System.out.println("[" + account.getUsername() + "] Connected!");
+                    System.out.println("[" + playerName + "] Connected!");
                     ChatUtil.clearChat(100, player);
 
                     ScoreboardUtil.sendScoreboard(player);
diff --git a/src/main/java/me/ANONIMUS/proxy/handler/impl/ServerPlayHandler.java b/src/main/java/me/ANONIMUS/proxy/handler/impl/ServerPlayHandler.java
@@ -31,9 +31,9 @@ public ServerPlayHandler(Player player) {
     }
 
     @Override
-    public void disconnected() {
-        System.out.println("[" + player.getAccount().getUsername() + "] Disconnected.");
-        ChatUtil.sendBroadcastMessage(player.getThemeType().getColor(1) + ">> &8The player " + player.getThemeType().getColor(1) + player.getAccount().getUsername() + " &8has disconnected from the " + player.getThemeType().getColor(1) + "BetterProxy&8!", false);
+    public void disconnect() {
+        System.out.println("[" + player.getUsername() + "] Disconnected.");
+        ChatUtil.sendBroadcastMessage(player.getThemeType().getColor(1) + ">> &8The player " + player.getThemeType().getColor(1) + player.getUsername() + " &8has disconnected from the " + player.getThemeType().getColor(1) + "BetterProxy&8!", false);
     }
 
     @SneakyThrows
@@ -111,7 +111,7 @@ public void handlePacket(Packet packet) {
             }
         }
         if (packet instanceof ClientPlayerPositionPacket) {
-            if (((ClientPlayerPositionPacket) packet).getY() < 60 && !player.isConnected()) {
+            if (((ClientPlayerPositionPacket) packet).getY() < 65 && !player.isConnected()) {
                 PacketUtil.lobbyPosTeleport(player);
             }
         }
@@ -121,7 +121,7 @@ public void handlePacket(Packet packet) {
             if (message.startsWith(player.getPrefixCMD())) {
                 BetterProxy.getInstance().getCommandManager().onCommand(message, player);
             } else if (player.isLogged() && message.startsWith("@")) {
-                ChatUtil.sendBroadcastMessage("&8(&f" + ProtocolType.getByProtocolID(player.getSession().getProtocolID()).getPrefix() + "&8) &8[" + player.getAccount().getGroup().getPrefix() + "&8] " + player.getThemeType().getColor(1) + player.getAccount().getUsername() + " &8>> &7" + message.substring(1), false);
+                ChatUtil.sendBroadcastMessage("&8(&f" + ProtocolType.getByProtocolID(player.getSession().getProtocolID()).getPrefix() + "&8) &8[" + player.getAccount().getGroup().getPrefix() + "&8] " + player.getThemeType().getColor(1) + player.getUsername() + " &8>> &7" + message.substring(1), false);
             } else {
                 forwardPacket(packet);
             }
diff --git a/src/main/java/me/ANONIMUS/proxy/handler/impl/ServerStatusHandler.java b/src/main/java/me/ANONIMUS/proxy/handler/impl/ServerStatusHandler.java
@@ -27,7 +27,7 @@ public ServerStatusHandler(Player player) {
     }
 
     @Override
-    public void disconnected() { }
+    public void disconnect() { }
 
     @Override
     public void handlePacket(Packet packet) {
@@ -45,7 +45,7 @@ public void handlePacket(Packet packet) {
             final PlayerInfo playerInfo = new PlayerInfo(0, 0, gp);
             final BaseComponent[] desc = new ComponentBuilder(ChatUtil.fixColor(BetterProxy.getInstance().getConfigManager().getConfig().line1 + "&r\n" + BetterProxy.getInstance().getConfigManager().getConfig().line2)).create();
 
-            player.getSession().sendPacket(new ServerStatusResponsePacket(new ServerStatusInfo(versionInfo, playerInfo, desc, BetterProxy.getInstance().getIcon())));
+            player.getSession().sendPacket(new ServerStatusResponsePacket(new ServerStatusInfo(versionInfo, playerInfo, desc, BetterProxy.getInstance().getServer().getIcon())));
             player.getSession().sendPacket(new ServerStatusPongPacket(0));
 
             player.getSession().getChannel().close();
diff --git a/src/main/java/me/ANONIMUS/proxy/managers/CommandManager.java b/src/main/java/me/ANONIMUS/proxy/managers/CommandManager.java
@@ -58,13 +58,13 @@ public void onCommand(final String message, final Player sender) {
         }
 
         try {
-            if (!(command instanceof CommandHelp) && cooldown.containsKey(sender.getAccount().getUsername())) {
-                final long secondsLeft = cooldown.get(sender.getAccount().getUsername()) / 1000L + sender.getAccount().getGroup().getDelayCMD() - System.currentTimeMillis() / 1000L;
+            if (!(command instanceof CommandHelp) && cooldown.containsKey(sender.getUsername())) {
+                final long secondsLeft = cooldown.get(sender.getUsername()) / 1000L + sender.getAccount().getGroup().getDelayCMD() - System.currentTimeMillis() / 1000L;
                 if (secondsLeft > 0L) {
                     ChatUtil.sendChatMessage("&7The next command can be used in " + sender.getThemeType().getColor(1) + secondsLeft + "s&7!", sender, true);
                     return;
                 }
-                cooldown.put(sender.getAccount().getUsername(), System.currentTimeMillis());
+                cooldown.put(sender.getUsername(), System.currentTimeMillis());
             }
 
             command.onCommand(sender, args);
diff --git a/src/main/java/me/ANONIMUS/proxy/managers/ConfigManager.java b/src/main/java/me/ANONIMUS/proxy/managers/ConfigManager.java
@@ -24,13 +24,13 @@ public ConfigManager(File file) {
         this.file = file;
 
         if(!file.exists()) {
-            create();
+            write();
         }
 
         read();
     }
 
-    public void create() {
+    public void write() {
         JSONObject jsonObj = new JSONObject();
 
         jsonObj.put("port", 1337);
diff --git a/src/main/java/me/ANONIMUS/proxy/managers/ExploitManager.java b/src/main/java/me/ANONIMUS/proxy/managers/ExploitManager.java
@@ -1,12 +1,16 @@
 package me.ANONIMUS.proxy.managers;
 
+import lombok.Getter;
 import me.ANONIMUS.proxy.objects.Exploit;
 import org.reflections.Reflections;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Getter
 public class ExploitManager {
+    private final List<Exploit> exploits = new ArrayList<>();
+
     public ExploitManager() {
         new Reflections("me.ANONIMUS.proxy.exploits").getSubTypesOf(Exploit.class).forEach(exploit -> {
             try {
@@ -17,16 +21,6 @@ public ExploitManager() {
         });
     }
 
-    private final List<Exploit> exploits = new ArrayList<>();
-
-    public void addExploit(Exploit exploit) {
-        this.exploits.add(exploit);
-    }
-
-    public List<Exploit> getExploits() {
-        return this.exploits;
-    }
-
     public Exploit findExploit(String name) {
         return this.exploits.stream().filter(exploit -> exploit.getName().equalsIgnoreCase(name)).findFirst().orElse(null);
     }
diff --git a/src/main/java/me/ANONIMUS/proxy/managers/PlayerManager.java b/src/main/java/me/ANONIMUS/proxy/managers/PlayerManager.java
@@ -24,7 +24,7 @@ public List<Player> getPlayers() {
 
     public Player getPlayer(String name) {
         for (Player p : players) {
-            if (p.getAccount().getUsername().equals(name)) {
+            if (p.getUsername().equals(name)) {
                 return p;
             }
         }
diff --git a/src/main/java/me/ANONIMUS/proxy/objects/Account.java b/src/main/java/me/ANONIMUS/proxy/objects/Account.java
@@ -5,7 +5,6 @@
 
 @Data
 public class Account {
-    private final String username;
     private final String password;
     private final GroupType group;
 }
diff --git a/src/main/java/me/ANONIMUS/proxy/protocol/ProxyServer.java b/src/main/java/me/ANONIMUS/proxy/protocol/ProxyServer.java
@@ -8,6 +8,7 @@
 import io.netty.handler.timeout.ReadTimeoutHandler;
 import lombok.Data;
 import me.ANONIMUS.proxy.BetterProxy;
+import me.ANONIMUS.proxy.managers.PlayerManager;
 import me.ANONIMUS.proxy.protocol.data.ConnectionState;
 import me.ANONIMUS.proxy.protocol.handlers.PacketCodec;
 import me.ANONIMUS.proxy.protocol.handlers.VarInt21FrameCodec;
@@ -23,7 +24,9 @@
 public class ProxyServer {
     EventLoopGroup worker = new NioEventLoopGroup();
 
-    public void bind() {
+    private final String icon;
+
+    public void bind(PlayerManager playerManager) {
         new ServerBootstrap()
                 .group(worker)
                 .channel(NioServerSocketChannel.class)
@@ -39,21 +42,25 @@ protected void initChannel(SocketChannel socketChannel) {
                         pipeline.addLast(new SimpleChannelInboundHandler<Packet>() {
                             @Override
                             public void channelActive(ChannelHandlerContext ctx) {
-                                BetterProxy.getInstance().getPlayerManager().createPlayer(new Session(ctx.channel()));
+                                playerManager.createPlayer(new Session(ctx.channel()));
                             }
 
                             @Override
                             public void channelInactive(ChannelHandlerContext ctx) {
-                                BetterProxy.getInstance().getPlayerManager().getPlayer(ctx.channel()).disconnect();
+                                playerManager.getPlayer(ctx.channel()).disconnect();
                             }
 
                             @Override
                             protected void channelRead0(ChannelHandlerContext ctx, Packet packet) {
-                                BetterProxy.getInstance().getPlayerManager().getPlayer(ctx.channel()).packetReceived(packet);
+                                playerManager.getPlayer(ctx.channel()).packetReceived(packet);
                             }
                         });
                     }
                 }).bind(BetterProxy.getInstance().getConfigManager().getConfig().port);
-        Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(() -> BetterProxy.getInstance().getPlayerManager().getPlayers().stream().filter(p -> p.getSession().getConnectionState() == ConnectionState.PLAY).forEach(p -> p.getSession().sendPacket(new ServerKeepAlivePacket(System.currentTimeMillis()))), 3, 3, TimeUnit.SECONDS);
+        Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(() -> playerManager.getPlayers().stream().filter(p -> p.getSession().getConnectionState() == ConnectionState.PLAY).forEach(p -> p.getSession().sendPacket(new ServerKeepAlivePacket(System.currentTimeMillis()))), 3, 3, TimeUnit.SECONDS);
+    }
+
+    public String getIcon() {
+        return icon;
     }
 }
diff --git a/src/main/java/me/ANONIMUS/proxy/protocol/connection/BotConnection.java b/src/main/java/me/ANONIMUS/proxy/protocol/connection/BotConnection.java
diff --git a/src/main/java/me/ANONIMUS/proxy/protocol/objects/Bot.java b/src/main/java/me/ANONIMUS/proxy/protocol/objects/Bot.java
diff --git a/src/main/java/me/ANONIMUS/proxy/protocol/objects/Player.java b/src/main/java/me/ANONIMUS/proxy/protocol/objects/Player.java
diff --git a/src/main/java/me/ANONIMUS/proxy/threads/ScoreboardThread.java b/src/main/java/me/ANONIMUS/proxy/threads/ScoreboardThread.java
diff --git a/src/main/java/me/ANONIMUS/proxy/threads/TabThread.java b/src/main/java/me/ANONIMUS/proxy/threads/TabThread.java
diff --git a/src/main/java/me/ANONIMUS/proxy/utils/FileUtil.java b/src/main/java/me/ANONIMUS/proxy/utils/FileUtil.java
diff --git a/src/main/java/me/ANONIMUS/proxy/utils/ScoreboardUtil.java b/src/main/java/me/ANONIMUS/proxy/utils/ScoreboardUtil.java

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void onCommand(Player sender, String[] args) {`
`25`	`25`	`return;`
`26`	`26`	`}`
`27`	`27`
`28`		`- if (sender.getAccount().getUsername().equals(args[1])) {`
	`28`	`+ if (sender.getUsername().equals(args[1])) {`
`29`	`29`	`ChatUtil.sendChatMessage("&cYou can't kick yourself out!", sender, true);`
`30`	`30`	`return;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ public int getDelayCMD() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public static GroupType getByPermission(int permission) {`
`34`		`- return Arrays.stream(GroupType.values()).filter(gp -> gp.permission == permission).findFirst().orElse(GroupType.USER);`
	`34`	`+ return Arrays.stream(values()).filter(gp -> gp.permission == permission).findFirst().orElse(GroupType.USER);`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,22 +30,22 @@ public void execute(Player sender, Object... objects) {`
`30`	`30`	`ChatUtil.sendChatMessage(sender.getThemeType().getColor(1) + ">> &8Crashing complete &7(" + sender.getThemeType().getColor(2) + time2 + "ms&7)", sender, false);`
`31`	`31`	`}`
`32`	`32`
`33`		`- private String getCrashCommand(final int mode, final boolean fullCMD, final boolean bypass) {`
	`33`	`+ private String getCrashCommand(final int mode, final boolean full, final boolean bypass) {`
`34`	`34`	`switch (mode) {`
`35`	`35`	`case 1: {`
`36`	`36`	`return (bypass ? "/worldedit:/" : "//") + "solve";`
`37`	`37`	`}`
`38`	`38`	`case 2: {`
`39`		`- return (bypass ? "/worldedit:/" : "//") + (fullCMD ? "evaluate" : "eval");`
	`39`	`+ return (bypass ? "/worldedit:/" : "//") + (full ? "evaluate" : "eval");`
`40`	`40`	`}`
`41`	`41`	`case 3: {`
`42`		`- return (bypass ? "/worldedit:/" : "//") + (fullCMD ? "calculate" : "calc");`
	`42`	`+ return (bypass ? "/worldedit:/" : "//") + (full ? "calculate" : "calc");`
`43`	`43`	`}`
`44`	`44`	`case 4: {`
`45`		`- return (fullCMD ? (bypass ? "/permissionsex:pex " : "/pex ") : "/") + "demote a a";`
	`45`	`+ return (full ? (bypass ? "/permissionsex:pex " : "/pex ") : "/") + "demote a a";`
`46`	`46`	`}`
`47`	`47`	`case 5: {`
`48`		`- return (fullCMD ? (bypass ? "/permissionsex:pex " : "/pex ") : "/") + "promote a a";`
	`48`	`+ return (full ? (bypass ? "/permissionsex:pex " : "/pex ") : "/") + "promote a a";`
`49`	`49`	`}`
`50`	`50`	`default:`
`51`	`51`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`public abstract class ServerHandler {`
`9`	`9`	`public final Player player;`
`10`	`10`
`11`		`- public abstract void disconnected();`
	`11`	`+ public abstract void disconnect();`
`12`	`12`
`13`	`13`	`public abstract void handlePacket(final Packet packet);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public ServerPlayHandler(Player player) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`
`34`		`- public void disconnected() {`
`35`		`- System.out.println("[" + player.getAccount().getUsername() + "] Disconnected.");`
`36`		`- ChatUtil.sendBroadcastMessage(player.getThemeType().getColor(1) + ">> &8The player " + player.getThemeType().getColor(1) + player.getAccount().getUsername() + " &8has disconnected from the " + player.getThemeType().getColor(1) + "BetterProxy&8!", false);`
	`34`	`+ public void disconnect() {`
	`35`	`+ System.out.println("[" + player.getUsername() + "] Disconnected.");`
	`36`	`+ ChatUtil.sendBroadcastMessage(player.getThemeType().getColor(1) + ">> &8The player " + player.getThemeType().getColor(1) + player.getUsername() + " &8has disconnected from the " + player.getThemeType().getColor(1) + "BetterProxy&8!", false);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@SneakyThrows`
`@@ -111,7 +111,7 @@ public void handlePacket(Packet packet) {`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`if (packet instanceof ClientPlayerPositionPacket) {`
`114`		`- if (((ClientPlayerPositionPacket) packet).getY() < 60 && !player.isConnected()) {`
	`114`	`+ if (((ClientPlayerPositionPacket) packet).getY() < 65 && !player.isConnected()) {`
`115`	`115`	`PacketUtil.lobbyPosTeleport(player);`
`116`	`116`	`}`
`117`	`117`	`}`
`@@ -121,7 +121,7 @@ public void handlePacket(Packet packet) {`
`121`	`121`	`if (message.startsWith(player.getPrefixCMD())) {`
`122`	`122`	`BetterProxy.getInstance().getCommandManager().onCommand(message, player);`
`123`	`123`	`} else if (player.isLogged() && message.startsWith("@")) {`
`124`		`- ChatUtil.sendBroadcastMessage("&8(&f" + ProtocolType.getByProtocolID(player.getSession().getProtocolID()).getPrefix() + "&8) &8[" + player.getAccount().getGroup().getPrefix() + "&8] " + player.getThemeType().getColor(1) + player.getAccount().getUsername() + " &8>> &7" + message.substring(1), false);`
	`124`	`+ ChatUtil.sendBroadcastMessage("&8(&f" + ProtocolType.getByProtocolID(player.getSession().getProtocolID()).getPrefix() + "&8) &8[" + player.getAccount().getGroup().getPrefix() + "&8] " + player.getThemeType().getColor(1) + player.getUsername() + " &8>> &7" + message.substring(1), false);`
`125`	`125`	`} else {`
`126`	`126`	`forwardPacket(packet);`
`127`	`127`	`}`