From 6db56fd68b79e865b4ae3334ba4ba193e683617e Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Mon, 17 Aug 2020 20:04:12 -0500 Subject: [PATCH] Disable fireworks for consoles (Addresses #1083, #1164) Not ideal, but there isn't a whole lot we can do as this is a game bug within console versions. --- .../java/org/geysermc/connector/entity/FireworkEntity.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java b/connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java index 5e47cb0f..b940b87b 100644 --- a/connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java +++ b/connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java @@ -40,6 +40,7 @@ import org.geysermc.connector.entity.type.EntityType; import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.utils.FireworkColor; import org.geysermc.connector.utils.MathUtils; +import org.geysermc.floodgate.util.DeviceOS; import java.util.ArrayList; import java.util.List; @@ -64,6 +65,12 @@ public class FireworkEntity extends Entity { return; } + // TODO: Remove once Mojang fixes bugs with fireworks crashing clients on these specific devices. + // https://bugs.mojang.com/browse/MCPE-89115 + if (session.getClientData().getDeviceOS() == DeviceOS.XBOX_ONE || session.getClientData().getDeviceOS() == DeviceOS.ORBIS) { + return; + } + CompoundTag fireworks = tag.get("Fireworks"); NbtMapBuilder fireworksBuilder = NbtMap.builder();