Merge branch 'master' of https://github.com/GeyserMC/Geyser into feat…

…ure/1.19-bedrock
KrystilizeNevaDies · May 26, 2022 · 83c3097 · 83c3097
2 parents 29c819f + d74b0e2
commit 83c3097
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EnderDragonEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/monster/EnderDragonEntity.java
@@ -39,6 +39,7 @@
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.util.DimensionUtils;
 
+import java.util.Optional;
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
@@ -262,6 +263,7 @@ private void effectTick() {
                         spawnParticleEffectPacket.setDimensionId(DimensionUtils.javaToBedrock(session.getDimension()));
                         spawnParticleEffectPacket.setPosition(head.getPosition().add(random.nextGaussian() / 2f, random.nextGaussian() / 2f, random.nextGaussian() / 2f));
                         spawnParticleEffectPacket.setIdentifier("minecraft:dragon_breath_fire");
+                        spawnParticleEffectPacket.setMolangVariablesJson(Optional.empty());
                         session.sendUpstreamPacket(spawnParticleEffectPacket);
                     }
                 }

diff --git a/.../main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaAnimateTranslator.java b/.../main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaAnimateTranslator.java
@@ -36,6 +36,8 @@
 import org.geysermc.geyser.translator.protocol.Translator;
 import org.geysermc.geyser.util.DimensionUtils;
 
+import java.util.Optional;
+
 @Translator(packet = ClientboundAnimatePacket.class)
 public class JavaAnimateTranslator extends PacketTranslator<ClientboundAnimatePacket> {
 
@@ -77,6 +79,7 @@ public void translate(GeyserSession session, ClientboundAnimatePacket packet) {
                 stringPacket.setDimensionId(DimensionUtils.javaToBedrock(session.getDimension()));
                 stringPacket.setPosition(Vector3f.ZERO);
                 stringPacket.setUniqueEntityId(entity.getGeyserId());
+                stringPacket.setMolangVariablesJson(Optional.empty());
                 session.sendUpstreamPacket(stringPacket);
                 break;
             case LEAVE_BED:

diff --git a/...java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelParticlesTranslator.java b/...java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelParticlesTranslator.java
@@ -42,6 +42,7 @@
 import org.geysermc.geyser.registry.type.ParticleMapping;
 import org.geysermc.geyser.util.DimensionUtils;
 
+import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Function;
@@ -150,6 +151,7 @@ private Function<Vector3f, BedrockPacket> createParticle(GeyserSession session,
                         stringPacket.setIdentifier(particleMapping.identifier());
                         stringPacket.setDimensionId(dimensionId);
                         stringPacket.setPosition(position);
+                        stringPacket.setMolangVariablesJson(Optional.empty());
                         return stringPacket;
                     };
                 } else {