From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Xymb Date: Thu, 22 Jun 2023 00:37:27 +0200 Subject: [PATCH] Option to disable arm swing event diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java index b23f2df433d7ebc871f4009081c28ed9054d91c7..ec71f3f52cb8f7931aabd94619d2e7a24491d7ad 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java @@ -209,10 +209,12 @@ public class KaiijuConfig { public static boolean disableVanishApi = false; public static boolean disablePlayerStats = false; + public static boolean disableArmSwingEvent = false; private static void optimizationSettings() { disableVanishApi = getBoolean("optimization.disable-vanish-api", disableVanishApi); disablePlayerStats = getBoolean("optimization.disable-player-stats", disablePlayerStats); + disableArmSwingEvent = getBoolean("optimization.disable-arm-swing-event", disableArmSwingEvent); } public static String serverModName = "Kaiiju"; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java index 1ab0d3e0653028b7d93177c28c1f532d8b10b1b1..86e14f3d853d6134b7d7b3770107529de8ac2c91 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2656,6 +2656,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); if (this.player.isImmobile()) return; // CraftBukkit this.player.resetLastActionTime(); + if (!dev.kaiijumc.kaiiju.KaiijuConfig.disableArmSwingEvent) { // Kaiiju // CraftBukkit start - Raytrace to look for 'rogue armswings' float f1 = this.player.getXRot(); float f2 = this.player.getYRot(); @@ -2678,6 +2679,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (event.isCancelled()) return; // CraftBukkit end + } // Kaiiju this.player.swing(packet.getHand()); }