Merge branch '1.20.4' into 1.20.4-folia

NiFeather · Mar 23, 2024 · 9192bda · 9192bda
2 parents 0ba9871 + e6a9afb
commit 9192bda
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/...java/xiamomc/morph/backends/server/renderer/network/datawatcher/values/CreeperValues.java b/...java/xiamomc/morph/backends/server/renderer/network/datawatcher/values/CreeperValues.java
@@ -3,7 +3,7 @@
 public class CreeperValues extends MonsterValues
 {
     public final SingleValue<Integer> STATE = getSingle("creeper_state", 0);
-    public final SingleValue<Boolean> IS_CHARGED_CREEPER = getSingle("creeper_is_charged", false);
+    public final SingleValue<Boolean> IS_CHARGED_CREEPER = getSingle("creeper_is_charged", false).withRandom(false, false, false, false, true);
     public final SingleValue<Boolean> IGNITED = getSingle("creeper_ignited", false);
 
     public CreeperValues()

diff --git a/...omc/morph/backends/server/renderer/network/datawatcher/watchers/types/CreeperWatcher.java b/...omc/morph/backends/server/renderer/network/datawatcher/watchers/types/CreeperWatcher.java
@@ -1,5 +1,6 @@
 package xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.types;
 
+import net.minecraft.nbt.CompoundTag;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
@@ -18,4 +19,21 @@ protected void initRegistry()
 
         register(ValueIndex.CREEPER);
     }
+
+    @Override
+    public void mergeFromCompound(CompoundTag nbt)
+    {
+        super.mergeFromCompound(nbt);
+
+        if (nbt.contains("powered"))
+            this.write(ValueIndex.CREEPER.IS_CHARGED_CREEPER, nbt.getBoolean("powered"));
+    }
+
+    @Override
+    public void writeToCompound(CompoundTag nbt)
+    {
+        super.writeToCompound(nbt);
+
+        nbt.putBoolean("powered", this.get(ValueIndex.CREEPER.IS_CHARGED_CREEPER));
+    }
 }