From 57fa627849546ae55197d3f3dd5615a67f9c9b08 Mon Sep 17 00:00:00 2001
From: Reider745 <70357814+Reider745@users.noreply.github.com>
Date: Fri, 5 Jan 2024 09:13:56 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BE=D0=BA=D0=B5=D1=82=20=D1=81?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0=20=D0=B2=20=D1=81=D0=BB?=
 =?UTF-8?q?=D1=83=D1=87=D0=B0=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Добавлен аргумент -snowfall_everywhere
- Убран NativeNetworking.NetworkLoopHandler.CLIENT_HANDLER
- Добавлена поддержка ников в глобальном бане
---
 src/main/java/com/reider745/Main.java               |  6 +++++-
 .../java/com/reider745/hooks/GlobalBanList.java     | 13 ++++---------
 .../zhekasmirnov/apparatus/multiplayer/Network.java |  2 +-
 .../apparatus/multiplayer/socket/SocketServer.java  |  6 +++---
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/reider745/Main.java b/src/main/java/com/reider745/Main.java
index 9e2635d8..a6bf9917 100644
--- a/src/main/java/com/reider745/Main.java
+++ b/src/main/java/com/reider745/Main.java
@@ -75,7 +75,11 @@ public class Main {
         loader.registerHooksInitializationForClass(LevelHooks.class);
         loader.registerHooksInitializationForClass(ItemUtils.class);
         loader.registerHooksInitializationForClass(AndroidHooks.class);
-        // loader.registerHooksInitializationForClass(SnowfallEverywhere.class);
+
+        for(String arg : args)
+            if(arg.equals("-snowfall_everywhere"))
+                loader.registerHooksInitializationForClass(SnowfallEverywhere.class);
+
         // loader.registerHooksInitializationForClass(BiomesHooks.class);
         loader.registerHooksInitializationForClass(GlobalBanList.class);
 
diff --git a/src/main/java/com/reider745/hooks/GlobalBanList.java b/src/main/java/com/reider745/hooks/GlobalBanList.java
index 0bfd17c1..6ef98ba8 100644
--- a/src/main/java/com/reider745/hooks/GlobalBanList.java
+++ b/src/main/java/com/reider745/hooks/GlobalBanList.java
@@ -43,9 +43,7 @@ public class GlobalBanList implements HookClass {
 
                 list = new JSONArray(result);
             }
-        } catch (Exception ignored) {
-            ignored.printStackTrace();
-        }
+        } catch (Exception ignored) {}
 
         final String[] banListGit = new String[list.length()];
         for(int i = 0;i < banListGit.length;i++)
@@ -55,12 +53,9 @@ public class GlobalBanList implements HookClass {
 
     @Inject
     public static boolean isBanned(BanList self, String name){
-        final String file = ReflectHelper.getField(self, "file");
-
-        if(file != null && file.endsWith("banned-ips.json"))
-            for(final String ip : banList)
-                if(ip.equals(name))
-                    return true;
+        for(final String ip : banList)
+            if(ip.equals(name))
+                return true;
 
         if (!self.isEnable() || name == null)
             return false;
diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/Network.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/Network.java
index dd633d1a..903fe8fd 100644
--- a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/Network.java
+++ b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/Network.java
@@ -187,7 +187,7 @@ public class Network {
         //shutdown();
 
         NativeNetworking.NetworkLoopHandler handler = new NativeNetworking.NetworkLoopHandler(
-                NativeNetworking.NetworkLoopHandler.GLOBAL_HANDLER | NativeNetworking.NetworkLoopHandler.SERVER_HANDLER | NativeNetworking.NetworkLoopHandler.CLIENT_HANDLER
+                NativeNetworking.NetworkLoopHandler.GLOBAL_HANDLER | NativeNetworking.NetworkLoopHandler.SERVER_HANDLER
         ).start();
 
         startServer(port);
diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/socket/SocketServer.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/socket/SocketServer.java
index 4aa01a66..0d7f9195 100644
--- a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/socket/SocketServer.java
+++ b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/socket/SocketServer.java
@@ -43,6 +43,8 @@ public class SocketServer {
                          continue;
                      }
 
+                     Logger.debug("New socket connection "+socket.getInetAddress());
+
                      try {
                          int protocol = socket.getInputStream().read();
                          DataChannel channel = DataChannelFactory.newDataChannelViaSupportedProtocol(socket, protocol);
@@ -53,8 +55,7 @@ public class SocketServer {
                             } catch (IOException e) {
                                 e.printStackTrace();
                             }
-                            isRunning = false;
-                            return;
+                            continue;
                          }
 
                          boolean isChannelManaged = false;
@@ -70,7 +71,6 @@ public class SocketServer {
                          } catch (IOException e) {
                              e.printStackTrace();
                          }
-                         isRunning = false;
                      }
                  }
             }).start();