From f2f894b1d16fe1b30af52a3daccfda825173dae7 Mon Sep 17 00:00:00 2001 From: AJ Ferguson Date: Thu, 30 Jun 2022 17:40:30 -0400 Subject: [PATCH] Fix IronGolem cracked texture and sound (#3103) * Update mappings submodule * Set IronGolem maxHealth to 100 by default Fixes cracked texture on vanilla servers * Add detail to comment --- .../geysermc/geyser/entity/type/living/IronGolemEntity.java | 3 +++ core/src/main/resources/mappings | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/IronGolemEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/IronGolemEntity.java index e5cbb2f89..52e4a6f2f 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/type/living/IronGolemEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/IronGolemEntity.java @@ -45,6 +45,9 @@ public class IronGolemEntity extends GolemEntity { setFlag(EntityFlag.BRIBED, true); // Required, or else the overlay is black dirtyMetadata.put(EntityData.COLOR_2, (byte) 0); + // Default max health. Ensures correct cracked texture is used + // Bug reproducible in 1.19.0 JE vanilla/fabric when spawning a new iron golem + maxHealth = 100f; } @Nonnull diff --git a/core/src/main/resources/mappings b/core/src/main/resources/mappings index 05009c86f..27e9c97df 160000 --- a/core/src/main/resources/mappings +++ b/core/src/main/resources/mappings @@ -1 +1 @@ -Subproject commit 05009c86fb06ecab0ea4691ec96fc24fdc6c1ee5 +Subproject commit 27e9c97df1e9a2f9d1f05359a29181e6ee0810d2