From 6955b795a77a592c6359d3a0e2ff61239b69f040 Mon Sep 17 00:00:00 2001 From: MATRIX-feather Date: Tue, 19 Dec 2023 12:13:46 +0800 Subject: [PATCH 1/2] misc: Bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0fabe28c..d9990112 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -project_version=1.0.0-beta.2 +project_version=1.0.0-beta.3 # FM Protocols protocols_version=09b2b0a077 From d6c2e742a0391b5fbbf3193f8e25f8135f339943 Mon Sep 17 00:00:00 2001 From: MATRIX-feather Date: Tue, 19 Dec 2023 12:24:57 +0800 Subject: [PATCH 2/2] bruh --- .../datawatcher/watchers/types/LivingEntityWatcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/LivingEntityWatcher.java b/src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/LivingEntityWatcher.java index 5668ac8f..268cc4d4 100644 --- a/src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/LivingEntityWatcher.java +++ b/src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/LivingEntityWatcher.java @@ -80,13 +80,13 @@ protected void doSync() int potionColor = 0; List colors = new ObjectArrayList<>(); - boolean hasAmbient = true; + boolean hasAmbient = false; for (PotionEffect effect : player.getActivePotionEffects()) { if (effect.hasParticles()) colors.add(effect.getType().getColor()); - hasAmbient = effect.isAmbient() && hasAmbient; + hasAmbient = hasAmbient || effect.isAmbient(); } if (!colors.isEmpty())