fix: отключено отключения сокет сервера в случае ошибки

- Добавлен аргумент -snowfall_everywhere
- Убран NativeNetworking.NetworkLoopHandler.CLIENT_HANDLER
- Добавлена поддержка ников в глобальном бане
This commit is contained in:
Reider745
2024-01-05 09:13:56 +03:00
parent e5a3bff38a
commit 57fa627849
4 changed files with 13 additions and 14 deletions
+5 -1
View File
@@ -75,7 +75,11 @@ public class Main {
loader.registerHooksInitializationForClass(LevelHooks.class); loader.registerHooksInitializationForClass(LevelHooks.class);
loader.registerHooksInitializationForClass(ItemUtils.class); loader.registerHooksInitializationForClass(ItemUtils.class);
loader.registerHooksInitializationForClass(AndroidHooks.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(BiomesHooks.class);
loader.registerHooksInitializationForClass(GlobalBanList.class); loader.registerHooksInitializationForClass(GlobalBanList.class);
@@ -43,9 +43,7 @@ public class GlobalBanList implements HookClass {
list = new JSONArray(result); list = new JSONArray(result);
} }
} catch (Exception ignored) { } catch (Exception ignored) {}
ignored.printStackTrace();
}
final String[] banListGit = new String[list.length()]; final String[] banListGit = new String[list.length()];
for(int i = 0;i < banListGit.length;i++) for(int i = 0;i < banListGit.length;i++)
@@ -55,9 +53,6 @@ public class GlobalBanList implements HookClass {
@Inject @Inject
public static boolean isBanned(BanList self, String name){ 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) for(final String ip : banList)
if(ip.equals(name)) if(ip.equals(name))
return true; return true;
@@ -187,7 +187,7 @@ public class Network {
//shutdown(); //shutdown();
NativeNetworking.NetworkLoopHandler handler = new NativeNetworking.NetworkLoopHandler( 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(); ).start();
startServer(port); startServer(port);
@@ -43,6 +43,8 @@ public class SocketServer {
continue; continue;
} }
Logger.debug("New socket connection "+socket.getInetAddress());
try { try {
int protocol = socket.getInputStream().read(); int protocol = socket.getInputStream().read();
DataChannel channel = DataChannelFactory.newDataChannelViaSupportedProtocol(socket, protocol); DataChannel channel = DataChannelFactory.newDataChannelViaSupportedProtocol(socket, protocol);
@@ -53,8 +55,7 @@ public class SocketServer {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
isRunning = false; continue;
return;
} }
boolean isChannelManaged = false; boolean isChannelManaged = false;
@@ -70,7 +71,6 @@ public class SocketServer {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
isRunning = false;
} }
} }
}).start(); }).start();