GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Updated DeviceOs

Browse source
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) @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public enum DeviceOs { public enum DeviceOs {
UNKNOWN("Unknown"), UNKNOWN("Unknown"),
ANDROID("Android"), GOOGLE("Android"),
IOS("iOS"), IOS("iOS"),
OSX("macOS"), OSX("macOS"),
FIREOS("FireOS"), AMAZON("Amazon"),
GEARVR("Gear VR"), GEARVR("Gear VR"),
HOLOLENS("Hololens"), HOLOLENS("Hololens"),
WIN10("Windows 10"), UWP("Windows 10"),
WIN32("Windows"), WIN32("Windows x86"),
DEDICATED("Dedicated"), DEDICATED("Dedicated"),
ORBIS("PS4"), TVOS("Apple TV"),
PS4("PS4"),
NX("Switch"), NX("Switch"),
SWITCH("Switch"), XBOX("Xbox One"),
XBOX_ONE("Xbox One"), WINDOWS_PHONE("Windows Phone");
WIN_PHONE("Windows Phone");
private static final DeviceOs[] VALUES = values(); 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. // TODO: Remove once Mojang fixes bugs with fireworks crashing clients on these specific devices.
// https://bugs.mojang.com/browse/MCPE-89115 // 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; return;
} }