From 40a130d21c3768ee306a204b2d8c49dabc60befd Mon Sep 17 00:00:00 2001 From: Reider745 <70357814+Reider745@users.noreply.github.com> Date: Sun, 31 Dec 2023 07:48:44 +0300 Subject: [PATCH] Remove: KoshakAntiVPN, disable BiomesHooks --- iclibs/koshakantivpn-1.2.jar | Bin 7696 -> 0 bytes .../java/com/reider745/InnerCoreServer.java | 20 ------------------ src/main/java/com/reider745/Main.java | 2 +- .../java/com/reider745/hooks/BiomesHooks.java | 4 ++++ 4 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 iclibs/koshakantivpn-1.2.jar diff --git a/iclibs/koshakantivpn-1.2.jar b/iclibs/koshakantivpn-1.2.jar deleted file mode 100644 index 7270f7aea95b09b254b3b0b7b33c6a75d6616bd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7696 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 description = new HashMap<>(); - description.put("name", "KoshakAntiVPN"); - description.put("version", "SNAPSHOT"); - description.put("main", InnerCorePlugin.class.getName()); - description.put("api", new ArrayList()); - - final File dataFolderFile = new File(dataPath); - KoshakAntiVPN koshakAntiVPN = new KoshakAntiVPN(); - koshakAntiVPN.init(null, Server.getInstance(), new PluginDescription(description), dataFolderFile, dataFolderFile); - koshakAntiVPN.saveDefaultConfig(); - koshakAntiVPN.onLoad(); - koshakAntiVPN.setEnabled(); - } - Server.getInstance().getLogger().info("Registering Nukkit-MOT containment..."); PluginManager pluginManager = Server.getInstance().getPluginManager(); pluginManager.getPlugins().put(plugin.getDescription().getName(), plugin); diff --git a/src/main/java/com/reider745/Main.java b/src/main/java/com/reider745/Main.java index 257c1ac5..69cda967 100644 --- a/src/main/java/com/reider745/Main.java +++ b/src/main/java/com/reider745/Main.java @@ -76,7 +76,7 @@ public class Main { loader.registerHooksInitializationForClass(ItemUtils.class); loader.registerHooksInitializationForClass(AndroidHooks.class); loader.registerHooksInitializationForClass(SnowfallEverywhere.class); - loader.registerHooksInitializationForClass(BiomesHooks.class); + //loader.registerHooksInitializationForClass(BiomesHooks.class); loader.registerHooksInitializationForClass(GlobalBanList.class); //bug fix diff --git a/src/main/java/com/reider745/hooks/BiomesHooks.java b/src/main/java/com/reider745/hooks/BiomesHooks.java index 7fc333e1..40202fa8 100644 --- a/src/main/java/com/reider745/hooks/BiomesHooks.java +++ b/src/main/java/com/reider745/hooks/BiomesHooks.java @@ -61,9 +61,13 @@ public class BiomesHooks implements HookClass { @Inject(className = "cn.nukkit.level.generator.Normal") public static Biome pickBiome(Normal self, int x, int z) { final Biome[][] biomes_override = threads_biomes_replace.get(Thread.currentThread().getId()); + if(biomes_override == null) + return ((BiomeSelector) ReflectHelper.getField(self, "selector")).pickBiome(x, z); + final Biome biome = biomes_override[Math.abs(x % 16)][Math.abs(z % 16)]; if(biome != null) return biome; + return ((BiomeSelector) ReflectHelper.getField(self, "selector")).pickBiome(x, z); }