fix #169

MoriyaShiine · Apr 8, 2024 · 276d3b0 · 276d3b0
1 parent 20306d8
commit 276d3b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/moriyashiine/enchancement/client/EnchancementClient.java b/src/main/java/moriyashiine/enchancement/client/EnchancementClient.java
@@ -50,6 +50,8 @@ public class EnchancementClient implements ClientModInitializer {
 	public static final KeyBinding SLIDE_KEYBINDING = registerKeyBinding(() -> KeyBindingHelper.registerKeyBinding(new KeyBinding("key." + Enchancement.MOD_ID + ".slide", GLFW.GLFW_KEY_LEFT_CONTROL, "key.categories." + Enchancement.MOD_ID)));
 	public static final KeyBinding STRAFE_KEYBINDING = registerKeyBinding(() -> KeyBindingHelper.registerKeyBinding(new KeyBinding("key." + Enchancement.MOD_ID + ".strafe", GLFW.GLFW_KEY_LEFT_CONTROL, "key.categories." + Enchancement.MOD_ID)));
 
+	public static boolean betterCombatLoaded = false;
+
 	@Override
 	public void onInitializeClient() {
 		ClientPlayNetworking.registerGlobalReceiver(EnforceConfigMatchPacket.ID, new EnforceConfigMatchPacket.Receiver());
@@ -81,6 +83,7 @@ public void onInitializeClient() {
 		FabricLoader.getInstance().getModContainer(Enchancement.MOD_ID).ifPresent(modContainer -> ResourceManagerHelper.registerBuiltinResourcePack(Enchancement.id("alternate_dash"), modContainer, ResourcePackActivationType.NORMAL));
 		FabricLoader.getInstance().getModContainer(Enchancement.MOD_ID).ifPresent(modContainer -> ResourceManagerHelper.registerBuiltinResourcePack(Enchancement.id("alternate_gale"), modContainer, ResourcePackActivationType.NORMAL));
 		initEvents();
+		betterCombatLoaded = FabricLoader.getInstance().isModLoaded("bettercombat");
 	}
 
 	private void initEvents() {

diff --git a/src/main/java/moriyashiine/enchancement/client/event/CoyoteBiteEvent.java b/src/main/java/moriyashiine/enchancement/client/event/CoyoteBiteEvent.java
@@ -4,6 +4,7 @@
 
 package moriyashiine.enchancement.client.event;
 
+import moriyashiine.enchancement.client.EnchancementClient;
 import moriyashiine.enchancement.common.ModConfig;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
@@ -16,7 +17,7 @@ public class CoyoteBiteEvent implements ClientTickEvents.EndWorldTick {
 
 	@Override
 	public void onEndTick(ClientWorld world) {
-		if (ModConfig.coyoteBiteTicks > 0 && MinecraftClient.getInstance().targetedEntity != null) {
+		if (!EnchancementClient.betterCombatLoaded && ModConfig.coyoteBiteTicks > 0 && MinecraftClient.getInstance().targetedEntity != null) {
 			target = MinecraftClient.getInstance().targetedEntity;
 			ticks = ModConfig.coyoteBiteTicks;
 		}
@@ -25,6 +26,7 @@ public void onEndTick(ClientWorld world) {
 		}
 		if (ticks == 0 || target == null || target.isRemoved() || !target.isAlive()) {
 			target = null;
+			ticks = 0;
 		}
 	}
 }