Mark ReachHuds & ComboHuds as broken

moehreag · moehreag · commit 9cc03b74ea6b · 2025-03-12T12:18:16.000+01:00
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/LivingEntityMixin.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/LivingEntityMixin.java
@@ -50,7 +50,9 @@ public LivingEntityMixin(EntityType<?> type, World world) {
 		// 2 ticks or so? Defintely not perfect tho
 		if (source.getAttacker() instanceof PlayerEntity) {
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityDamage(this);
+			if (comboHud != null) {
+				comboHud.onEntityDamage(this);
+			}
 		}
 	}
 }
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java
@@ -58,7 +58,9 @@ protected PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World
 			}
 
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityAttack(entity);
+			if (comboHud != null) {
+				comboHud.onEntityAttack(entity);
+			}
 		}
 	}
 
@@ -83,7 +85,9 @@ protected PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World
 
 		if (source.getAttacker() instanceof PlayerEntity) {
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityDamage(this);
+			if (comboHud != null) {
+				comboHud.onEntityDamage(this);
+			}
 		}
 	}
 
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java
@@ -111,20 +111,23 @@ public void init() {
 		add(new ItemUpdateHud());
 		add(new PackDisplayHud());
 		add(new IRLTimeHud());
-		add(new ReachHud());
+		add(new ReachHud()); // TODO this is broken
 		add(new HotbarHUD());
 		add(new MemoryHud());
 		add(new PlayerCountHud());
 		add(new CompassHud());
 		add(new TPSHud());
-		add(new ComboHud());
+		add(new ComboHud()); // TODO this is broken
 		add(new PlayerHud());
 		add(new MouseMovementHud());
 		add(new DebugCountersHud());
 		add(new DayCounterHud());
 		entries.put(BedwarsMod.getInstance().getUpgradesOverlay().getId(), BedwarsMod.getInstance().getUpgradesOverlay());
 		entries.put(BedwarsMod.getInstance().getResourceOverlay().getId(), BedwarsMod.getInstance().getResourceOverlay());
 
+		((ReachHud) get(ReachHud.ID)).getEnabled().setForceOff(true, "feature.broken");
+		((ComboHud) get(ComboHud.ID)).getEnabled().setForceOff(true, "feature.broken");
+
 		entries.values().forEach(HudEntry::init);
 
 		refreshAllBounds();
diff --git a/1.20/src/main/java/io/github/axolotlclient/mixin/LivingEntityMixin.java b/1.20/src/main/java/io/github/axolotlclient/mixin/LivingEntityMixin.java
@@ -50,7 +50,9 @@ public LivingEntityMixin(EntityType<?> type, World world) {
 		// 2 ticks or so? Defintely not perfect tho
 		if (source.getAttacker() instanceof PlayerEntity) {
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityDamage(this);
+			if (comboHud != null) {
+				comboHud.onEntityDamage(this);
+			}
 		}
 	}
 }
diff --git a/1.20/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java b/1.20/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java
@@ -57,7 +57,9 @@ private PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World w
 			}
 
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityAttack(entity);
+			if (comboHud != null) {
+				comboHud.onEntityAttack(entity);
+			}
 		}
 	}
 
@@ -82,7 +84,9 @@ private PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World w
 
 		if (source.getAttacker() instanceof PlayerEntity) {
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityDamage(this);
+			if (comboHud != null) {
+				comboHud.onEntityDamage(this);
+			}
 		}
 	}
 }
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java b/1.20/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java
@@ -104,20 +104,23 @@ public void init() {
 		add(new ItemUpdateHud());
 		add(new PackDisplayHud());
 		add(new IRLTimeHud());
-		add(new ReachHud());
+		add(new ReachHud()); // TODO this is broken
 		add(new HotbarHUD());
 		add(new MemoryHud());
 		add(new PlayerCountHud());
 		add(new CompassHud());
 		add(new TPSHud());
-		add(new ComboHud());
+		add(new ComboHud()); // TODO this is broken
 		add(new PlayerHud());
 		add(new MouseMovementHud());
 		add(new DebugCountersHud());
 		add(new DayCounterHud());
 		entries.put(BedwarsMod.getInstance().getUpgradesOverlay().getId(), BedwarsMod.getInstance().getUpgradesOverlay());
 		entries.put(BedwarsMod.getInstance().getResourceOverlay().getId(), BedwarsMod.getInstance().getResourceOverlay());
 
+		((ReachHud) get(ReachHud.ID)).getEnabled().setForceOff(true, "feature.broken");
+		((ComboHud) get(ComboHud.ID)).getEnabled().setForceOff(true, "feature.broken");
+
 		entries.values().forEach(HudEntry::init);
 
 		refreshAllBounds();
diff --git a/1.21.4/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java b/1.21.4/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java
@@ -55,7 +55,9 @@ protected PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, Level
 			}
 
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityAttack(entity);
+			if (comboHud != null) {
+				comboHud.onEntityAttack(entity);
+			}
 		}
 	}
 
diff --git a/1.21/src/main/java/io/github/axolotlclient/mixin/LivingEntityMixin.java b/1.21/src/main/java/io/github/axolotlclient/mixin/LivingEntityMixin.java
@@ -50,7 +50,9 @@ public LivingEntityMixin(EntityType<?> type, World world) {
 		// 2 ticks or so? Defintely not perfect tho
 		if (source.getAttacker() instanceof PlayerEntity) {
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityDamage(this);
+			if (comboHud != null) {
+				comboHud.onEntityDamage(this);
+			}
 		}
 	}
 }
diff --git a/1.21/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java b/1.21/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java
@@ -57,7 +57,9 @@ private PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World w
 			}
 
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityAttack(entity);
+			if (comboHud != null) {
+				comboHud.onEntityAttack(entity);
+			}
 		}
 	}
 
@@ -82,7 +84,9 @@ private PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World w
 
 		if (source.getAttacker() instanceof PlayerEntity) {
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityDamage(this);
+			if (comboHud != null) {
+				comboHud.onEntityDamage(this);
+			}
 		}
 	}
 }
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java b/1.21/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java
@@ -104,19 +104,22 @@ public void init() {
 		add(new ItemUpdateHud());
 		add(new PackDisplayHud());
 		add(new IRLTimeHud());
-		add(new ReachHud());
+		add(new ReachHud()); // TODO this is broken
 		add(new HotbarHUD());
 		add(new MemoryHud());
 		add(new PlayerCountHud());
 		add(new CompassHud());
 		add(new TPSHud());
-		add(new ComboHud());
+		add(new ComboHud()); // TODO this is broken
 		add(new PlayerHud());
 		add(new MouseMovementHud());
 		add(new DebugCountersHud());
 		entries.put(BedwarsMod.getInstance().getUpgradesOverlay().getId(), BedwarsMod.getInstance().getUpgradesOverlay());
 		entries.put(BedwarsMod.getInstance().getResourceOverlay().getId(), BedwarsMod.getInstance().getResourceOverlay());
 
+		((ReachHud) get(ReachHud.ID)).getEnabled().setForceOff(true, "feature.broken");
+		((ComboHud) get(ComboHud.ID)).getEnabled().setForceOff(true, "feature.broken");
+
 		entries.values().forEach(HudEntry::init);
 
 		refreshAllBounds();
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/BufferBuilderMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/BufferBuilderMixin.java
@@ -31,7 +31,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(BufferBuilder.class)
-public class BufferBuilderMixin {
+public abstract class BufferBuilderMixin {
 
 	@WrapOperation(method = "grow", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;warn(Ljava/lang/String;)V", remap = false))
 	private void muteBufferBuilderWarnings(Logger instance, String s, Operation<Void> original, @Local(ordinal = 3) int newSize) {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/ItemEntityMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/ItemEntityMixin.java
@@ -29,7 +29,7 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ItemEntity.class)
-public class ItemEntityMixin {
+public abstract class ItemEntityMixin {
 
 	@Redirect(method = "getItemStack", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;error(Ljava/lang/String;)V", remap = false))
 	private void removeErrorLogging(Logger instance, String s) {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/ItemEntityRendererMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/ItemEntityRendererMixin.java
@@ -34,10 +34,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ItemEntityRenderer.class)
-public class ItemEntityRendererMixin {
+public abstract class ItemEntityRendererMixin {
 
 	@Inject(method = "applyItemBobbing", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;translatef(FFF)V", ordinal = 0), cancellable = true)
-	private void axolotlclient$transformItems(ItemEntity itemEntity, double d, double e, double f, float g, BakedModel bakedModel, CallbackInfoReturnable<Integer> cir, @Local int i) {
+	private void axolotlclient$transformItems(ItemEntity itemEntity, double d, double e, double f, float g, BakedModel bakedModel, CallbackInfoReturnable<Integer> cir, @Local(ordinal = 1) int i) {
 		if (AxolotlClient.CONFIG.flatItems.get()) {
 			GlStateManager.translated(d, e + 0.05, f);
 			GlStateManager.rotatef(itemEntity.pitch, 0, 0, 1);
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/LivingEntityMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/LivingEntityMixin.java
@@ -27,29 +27,54 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.living.LivingEntity;
+import net.minecraft.entity.living.effect.StatusEffect;
 import net.minecraft.entity.living.player.PlayerEntity;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(LivingEntity.class)
 public abstract class LivingEntityMixin extends Entity {
 
+	@Shadow
+	public abstract float getHealth();
+
+	@Shadow
+	public abstract boolean hasStatusEffect(StatusEffect statusEffect);
+
+	@Shadow
+	public int defaultMaxHealth;
+
 	public LivingEntityMixin(World world) {
 		super(world);
 	}
 
-	@Inject(method = "damage", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/living/LivingEntity;hurtTime:I"))
+	@Inject(method = "damage", at = @At(value = "HEAD"))
 	private void axolotlclient$onDamage(DamageSource source, float damage, CallbackInfoReturnable<Boolean> ci) {
+		if (this.isInvulnerable(source)) {
+			return;
+		}
+		if (getHealth() <= 0.0F) {
+			return;
+		} else if (source.isFire() && hasStatusEffect(StatusEffect.FIRE_RESISTANCE)) {
+			return;
+		}
+		if (this.maxHealth > this.defaultMaxHealth / 2.0F) {
+			return;
+		}
+
 		// The client doesn't really get any sort of information about why a person is damaged
-		// Kinda sucks since that means combos can't be guarenteed (i.e. fall damage, or other person hits)
+		// Kinda sucks since that means combos can't be guaranteed (i.e. fall damage, or other person hits)
 		// Possible fixes: Could wait for swing animation from a player to be played. Could then track eyes to see if hit, give or take
-		// 2 ticks or so? Defintely not perfect tho
+		// 2 ticks or so? Definitely not perfect tho
 		if (source.getAttacker() instanceof PlayerEntity) {
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityDamage(this);
+			if (comboHud != null) {
+				comboHud.onEntityDamage(this);
+			}
 		}
 	}
 }
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java
@@ -58,7 +58,9 @@ public PlayerEntityMixin(World world) {
 			}
 
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityAttack(entity);
+			if (comboHud != null) {
+				comboHud.onEntityAttack(entity);
+			}
 		}
 	}
 
@@ -83,7 +85,9 @@ public PlayerEntityMixin(World world) {
 
 		if (source.getAttacker() instanceof PlayerEntity) {
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
-			comboHud.onEntityDamage(this);
+			if (comboHud != null) {
+				comboHud.onEntityDamage(this);
+			}
 		}
 	}
 
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/PlayerInventoryScreenMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/PlayerInventoryScreenMixin.java
@@ -29,7 +29,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(PlayerInventoryScreen.class)
-public class PlayerInventoryScreenMixin {
+public abstract class PlayerInventoryScreenMixin {
 
 	@WrapWithCondition(method = "checkStatusEffects", at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/screen/inventory/menu/PlayerInventoryScreen;x:I"))
 	private boolean noInventoryShift(PlayerInventoryScreen instance, int value) {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/SharedConstantsMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/SharedConstantsMixin.java
@@ -31,7 +31,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(SharedConstants.class)
-public class SharedConstantsMixin {
+public abstract class SharedConstantsMixin {
 
 	@Inject(method = "isValidChatChar", at = @At("HEAD"), cancellable = true)
 	private static void allowColorCodeInput(char c, CallbackInfoReturnable<Boolean> cir) {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/SoundEngineMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/SoundEngineMixin.java
@@ -32,7 +32,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 
 @Mixin(SoundEngine.class)
-public class SoundEngineMixin {
+public abstract class SoundEngineMixin {
 
 	@WrapOperation(method = "play(Lnet/minecraft/client/sound/instance/SoundInstance;)V", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;warn(Lorg/apache/logging/log4j/Marker;Ljava/lang/String;[Ljava/lang/Object;)V", ordinal = 0, remap = false))
 	private void noWarningOnUnknownEvent(Logger instance, Marker marker, String s, Object[] objects, Operation<Void> original, SoundInstance sound) {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/TitleScreenMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/TitleScreenMixin.java
@@ -186,7 +186,7 @@ else if (button.id == 253)
 	@Inject(method = "<init>",
 		at = @At(value = "INVOKE",
 			target = "Ljava/util/List;isEmpty()Z", remap = false))
-	private void axolotlclient$customSplashTexts(CallbackInfo ci, @Local List<String> list) throws IOException {
+	private void axolotlclient$customSplashTexts(CallbackInfo ci, @Local ArrayList<String> list) throws IOException {
 		try (InputStream input = Minecraft.getInstance().getResourceManager()
 			.getResource(new Identifier("axolotlclient", "texts/splashes.txt")).asStream()) {
 			list.addAll(IOUtils.readLines(input));
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/VertexBufferMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/VertexBufferMixin.java
@@ -32,7 +32,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(VertexBuffer.class)
-public class VertexBufferMixin {
+public abstract class VertexBufferMixin {
 	@Shadow
 	private int id;
 
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/WorldRendererMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/WorldRendererMixin.java
@@ -31,6 +31,7 @@
 import net.minecraft.entity.living.player.PlayerEntity;
 import net.minecraft.world.HitResult;
 import net.minecraft.world.dimension.Dimension;
+import org.lwjgl.opengl.GL11;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -84,6 +85,11 @@ public abstract class WorldRendererMixin {
 		return width;
 	}
 
+	@Inject(method = "renderBlockOutline", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;depthMask(Z)V", ordinal = 1))
+	private void resetOutlineWidth(PlayerEntity playerEntity, HitResult hitResult, int i, float f4, CallbackInfo ci) {
+		GL11.glLineWidth(2.0F);
+	}
+
 	@Inject(method = "renderBlockOutline", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;color4f(FFFF)V", shift = At.Shift.AFTER))
 	public void axolotlclient$customOutlineColor(PlayerEntity playerEntity, HitResult hitResult, int i, float f, CallbackInfo ci) {
 		if (AxolotlClient.CONFIG.enableCustomOutlines.get()) {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/commands/ChatScreenMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/commands/ChatScreenMixin.java
@@ -41,7 +41,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ChatScreen.class)
-public class ChatScreenMixin {
+public abstract class ChatScreenMixin {
 	@Shadow
 	private boolean completed;
 	@Unique
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java
@@ -101,13 +101,13 @@ public void init() {
 		add(new ItemUpdateHud());
 		add(new PackDisplayHud());
 		add(new IRLTimeHud());
-		add(new ReachHud());
+		add(new ReachHud()); // TODO this is broken
 		add(new HotbarHUD());
 		add(new MemoryHud());
 		add(new PlayerCountHud());
 		add(new CompassHud());
 		add(new TPSHud());
-		add(new ComboHud());
+		add(new ComboHud()); // TODO this is broken
 		add(new PlayerHud());
 		add(new ChatHud());
 		add(new MouseMovementHud());
@@ -116,6 +116,9 @@ public void init() {
 		entries.put(BedwarsMod.getInstance().getUpgradesOverlay().getId(), BedwarsMod.getInstance().getUpgradesOverlay());
 		entries.put(BedwarsMod.getInstance().getResourceOverlay().getId(), BedwarsMod.getInstance().getResourceOverlay());
 
+		((ReachHud) get(ReachHud.ID)).getEnabled().setForceOff(true, "feature.broken");
+		((ComboHud) get(ComboHud.ID)).getEnabled().setForceOff(true, "feature.broken");
+
 		entries.values().forEach(HudEntry::init);
 		refreshAllBounds();
 
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PackDisplayHud.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PackDisplayHud.java
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/ComboHud.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/ComboHud.java
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/ReachHud.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/ReachHud.java

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,9 @@ public LivingEntityMixin(EntityType<?> type, World world) {`
`50`	`50`	`// 2 ticks or so? Defintely not perfect tho`
`51`	`51`	`if (source.getAttacker() instanceof PlayerEntity) {`
`52`	`52`	`ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);`
`53`		`- comboHud.onEntityDamage(this);`
	`53`	`+ if (comboHud != null) {`
	`54`	`+ comboHud.onEntityDamage(this);`
	`55`	`+ }`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,9 @@ protected PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);`
`61`		`- comboHud.onEntityAttack(entity);`
	`61`	`+ if (comboHud != null) {`
	`62`	`+ comboHud.onEntityAttack(entity);`
	`63`	`+ }`
`62`	`64`	`}`
`63`	`65`	`}`
`64`	`66`
`@@ -83,7 +85,9 @@ protected PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World`
`83`	`85`
`84`	`86`	`if (source.getAttacker() instanceof PlayerEntity) {`
`85`	`87`	`ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);`
`86`		`- comboHud.onEntityDamage(this);`
	`88`	`+ if (comboHud != null) {`
	`89`	`+ comboHud.onEntityDamage(this);`
	`90`	`+ }`
`87`	`91`	`}`
`88`	`92`	`}`
`89`	`93`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,9 @@ private PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World w`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);`
`60`		`- comboHud.onEntityAttack(entity);`
	`60`	`+ if (comboHud != null) {`
	`61`	`+ comboHud.onEntityAttack(entity);`
	`62`	`+ }`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`
`@@ -82,7 +84,9 @@ private PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World w`
`82`	`84`
`83`	`85`	`if (source.getAttacker() instanceof PlayerEntity) {`
`84`	`86`	`ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);`
`85`		`- comboHud.onEntityDamage(this);`
	`87`	`+ if (comboHud != null) {`
	`88`	`+ comboHud.onEntityDamage(this);`
	`89`	`+ }`
`86`	`90`	`}`
`87`	`91`	`}`
`88`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,9 @@ protected PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, Level`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);`
`58`		`- comboHud.onEntityAttack(entity);`
	`58`	`+ if (comboHud != null) {`
	`59`	`+ comboHud.onEntityAttack(entity);`
	`60`	`+ }`
`59`	`61`	`}`
`60`	`62`	`}`
`61`	`63`