From fd5c93707f1aeab4a75668e268c412042705d57b Mon Sep 17 00:00:00 2001 From: RettichLP Date: Sun, 26 Apr 2026 14:05:48 +0200 Subject: [PATCH 1/2] fix: handle null return value in EntityMixin to avoid potential crashes --- src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java index be3ea21e..4cc74d35 100644 --- a/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java +++ b/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java @@ -60,11 +60,12 @@ public abstract class EntityMixin { } ItemStack itemStack = itemEntity.getStack(); - if (!itemStack.isOf(SKELETON_SKULL) && !itemStack.isOf(WITHER_SKELETON_SKULL)) { + Text returnValue = cir.getReturnValue(); + if (returnValue == null || (!itemStack.isOf(SKELETON_SKULL) && !itemStack.isOf(WITHER_SKELETON_SKULL))) { return; } - String displayNameString = cir.getReturnValue().getString(); + String displayNameString = returnValue.getString(); // extract player name (✟RettichLP -> RettichLP) String playerName = displayNameString.substring(1); From 2cd0612f06e199be8d3d3ffef618684ad31df245 Mon Sep 17 00:00:00 2001 From: RettichLP Date: Sun, 26 Apr 2026 14:06:03 +0200 Subject: [PATCH 2/2] fix: rename method in PlayerEntityMixin for improved readability --- src/main/java/de/rettichlp/ucutils/mixin/PlayerEntityMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/rettichlp/ucutils/mixin/PlayerEntityMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/PlayerEntityMixin.java index b1237a72..3ec84432 100644 --- a/src/main/java/de/rettichlp/ucutils/mixin/PlayerEntityMixin.java +++ b/src/main/java/de/rettichlp/ucutils/mixin/PlayerEntityMixin.java @@ -24,7 +24,7 @@ public class PlayerEntityMixin { @Inject(method = "getDisplayName", at = @At("RETURN"), cancellable = true) - private void ucutils$getDisplayName(@NotNull CallbackInfoReturnable cir) { + private void ucutils$getDisplayNameReturn(@NotNull CallbackInfoReturnable cir) { GameProfile gameProfile = ((PlayerEntity) (Object) this).getGameProfile(); cir.setReturnValue(factionService.getEnrichedDisplayName(gameProfile.name())); }