From fb5a89459540473abf8bf528ccf119e42c549570 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+DoctorMacc@users.noreply.github.com> Date: Wed, 12 Aug 2020 09:22:13 -0400 Subject: [PATCH] EntityUtils: Properly map 1.14 entity status effects (#1133) Previously, Hero of the Village and Bad Omen effects were mapped to 0. This commit updates them to their proper Bedrock values. Fixes #1129 --- .../java/org/geysermc/connector/utils/EntityUtils.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/connector/src/main/java/org/geysermc/connector/utils/EntityUtils.java b/connector/src/main/java/org/geysermc/connector/utils/EntityUtils.java index b5033c94..51102202 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/EntityUtils.java +++ b/connector/src/main/java/org/geysermc/connector/utils/EntityUtils.java @@ -42,8 +42,7 @@ public class EntityUtils { case LUCK: case UNLUCK: case DOLPHINS_GRACE: - case BAD_OMEN: - case HERO_OF_THE_VILLAGE: + // All Java-exclusive effects as of 1.16.2 return 0; case LEVITATION: return 24; @@ -51,6 +50,10 @@ public class EntityUtils { return 26; case SLOW_FALLING: return 27; + case BAD_OMEN: + return 28; + case HERO_OF_THE_VILLAGE: + return 29; default: return effect.ordinal() + 1; }