44 lines
2.3 KiB
Diff
44 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Xymb <xymb@endcrystal.me>
|
|
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 8c872b2ad341f0105275209201fda03706535161..9b118a6e22264c88c0460016822b1920631fff85 100644
|
|
--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
|
|
+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
|
|
@@ -214,10 +214,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 544c38d6ea9abaa49e3eaa457cab73d6ed032986..b3d6f70b1b60607b35b9e3abe61c853ee5374a20 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -2693,6 +2693,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();
|
|
@@ -2725,6 +2726,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
|
|
|
if (event.isCancelled()) return;
|
|
// CraftBukkit end
|
|
+ } // Kaiiju
|
|
this.player.swing(packet.getHand());
|
|
}
|
|
|