GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Updated DeviceOs

This commit is contained in:
Tim203 2020-12-01 19:54:51 +01:00
parent e583abffdf
commit deae3d566d
No known key found for this signature in database
GPG Key ID: 064EE9F5BF7C3EE8
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/java/org/geysermc/floodgate/util/DeviceOs.java
View File

@ -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();

3
connector/src/main/java/org/geysermc/connector/entity/FireworkEntity.java
View File

@ -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;
}