From deae3d566d550a0420ddf27457ecf6639001935c Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Tue, 1 Dec 2020 19:54:51 +0100
Subject: [PATCH] Updated DeviceOs

---
 .../org/geysermc/floodgate/util/DeviceOs.java    | 16 ++++++++--------
 .../connector/entity/FireworkEntity.java         |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/src/main/java/org/geysermc/floodgate/util/DeviceOs.java b/common/src/main/java/org/geysermc/floodgate/util/DeviceOs.java
index b3245ef81..bbc5451cf 100644
--- a/common/src/main/java/org/geysermc/floodgate/util/DeviceOs.java
+++ b/common/src/main/java/org/geysermc/floodgate/util/DeviceOs.java
@@ -34,20 +34,20 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public enum DeviceOs {
     UNKNOWN("Unknown"),
-    ANDROID("Android"),
+    GOOGLE("Android"),
     IOS("iOS"),
     OSX("macOS"),
-    FIREOS("FireOS"),
+    AMAZON("Amazon"),
     GEARVR("Gear VR"),
     HOLOLENS("Hololens"),
-    WIN10("Windows 10"),
-    WIN32("Windows"),
+    UWP("Windows 10"),
+    WIN32("Windows x86"),
     DEDICATED("Dedicated"),
-    ORBIS("PS4"),
+    TVOS("Apple TV"),
+    PS4("PS4"),
     NX("Switch"),
-    SWITCH("Switch"),
-    XBOX_ONE("Xbox One"),
-    WIN_PHONE("Windows Phone");
+    XBOX("Xbox One"),
+    WINDOWS_PHONE("Windows Phone");
 
     private static final DeviceOs[] VALUES = values();
 
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 630a5edd9..7c53de8ea 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java
@@ -67,7 +67,8 @@ public class FireworkEntity extends Entity {
 
             // 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) {
+            if (session.getClientData().getDeviceOs() == DeviceOs.XBOX
+                    || session.getClientData().getDeviceOs() == DeviceOs.PS4) {
                 return;
             }