From 134b3a01170c5b0083cba88719fe3a4294150c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Fri, 13 Oct 2023 15:33:30 +0200 Subject: [PATCH] dont despawn when named --- .../java/com/faboslav/friendsandfoes/entity/RascalEntity.java | 1 + .../item/{ rascal_spawn_egg.json => rascal_spawn_egg.json} | 0 2 files changed, 1 insertion(+) rename common/src/main/resources/assets/friendsandfoes/models/item/{ rascal_spawn_egg.json => rascal_spawn_egg.json} (100%) diff --git a/common/src/main/java/com/faboslav/friendsandfoes/entity/RascalEntity.java b/common/src/main/java/com/faboslav/friendsandfoes/entity/RascalEntity.java index b8d398140..9fe33b596 100644 --- a/common/src/main/java/com/faboslav/friendsandfoes/entity/RascalEntity.java +++ b/common/src/main/java/com/faboslav/friendsandfoes/entity/RascalEntity.java @@ -286,6 +286,7 @@ public boolean damage( if ( attacker == null || attacker instanceof PlayerEntity == false + || this.hasCustomName() ) { return super.damage(source, amount); } diff --git a/common/src/main/resources/assets/friendsandfoes/models/item/ rascal_spawn_egg.json b/common/src/main/resources/assets/friendsandfoes/models/item/rascal_spawn_egg.json similarity index 100% rename from common/src/main/resources/assets/friendsandfoes/models/item/ rascal_spawn_egg.json rename to common/src/main/resources/assets/friendsandfoes/models/item/rascal_spawn_egg.json