From eb23a468875c6ae639f7db6c3f2c43d136524e77 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Tue, 31 May 2022 14:51:21 -0400 Subject: [PATCH] Fix frog color translation --- .../geyser/entity/type/living/animal/FrogEntity.java | 7 ++++++- core/src/main/java/org/geysermc/geyser/util/MathUtils.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/FrogEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/FrogEntity.java index 2c1c884fb..97af056a0 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/FrogEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/FrogEntity.java @@ -54,7 +54,12 @@ public class FrogEntity extends AnimalEntity { } public void setFrogVariant(IntEntityMetadata entityMetadata) { - dirtyMetadata.put(EntityData.VARIANT, entityMetadata.getPrimitiveValue()); + int variant = entityMetadata.getPrimitiveValue(); + dirtyMetadata.put(EntityData.VARIANT, switch (variant) { + case 1 -> 2; // White + case 2 -> 1; // Green + default -> variant; + }); } public void setTongueTarget(ObjectEntityMetadata entityMetadata) { diff --git a/core/src/main/java/org/geysermc/geyser/util/MathUtils.java b/core/src/main/java/org/geysermc/geyser/util/MathUtils.java index a89240f25..f1e262bc6 100644 --- a/core/src/main/java/org/geysermc/geyser/util/MathUtils.java +++ b/core/src/main/java/org/geysermc/geyser/util/MathUtils.java @@ -110,7 +110,7 @@ public class MathUtils { * @param high The high bound of the clamp * @return the clamped value */ - public static double clamp(float value, float low, float high) { + public static float clamp(float value, float low, float high) { if (value < low) { return low; }