mirror of
https://github.com/ViaVersion/ViaVersion.git
synced 2024-12-23 00:47:39 +01:00
Bossbar fix for delay-switch-until-joingame Velocity branch
This commit is contained in:
parent
d699000dc3
commit
1b7b3d1d28
@ -102,8 +102,6 @@ public class VelocityServerHandler {
|
|||||||
|
|
||||||
VelocityStorage storage = user.get(VelocityStorage.class);
|
VelocityStorage storage = user.get(VelocityStorage.class);
|
||||||
|
|
||||||
if (storage.getBossbar() == null) storage.saveServerBossBars();
|
|
||||||
|
|
||||||
if (e.getServer() != null) {
|
if (e.getServer() != null) {
|
||||||
if (!e.getServer().getServerInfo().getName().equals(storage.getCurrentServer())) {
|
if (!e.getServer().getServerInfo().getName().equals(storage.getCurrentServer())) {
|
||||||
String serverName = e.getServer().getServerInfo().getName();
|
String serverName = e.getServer().getServerInfo().getName();
|
||||||
|
@ -8,6 +8,7 @@ import us.myles.ViaVersion.api.data.UserConnection;
|
|||||||
import us.myles.ViaVersion.util.ReflectionUtil;
|
import us.myles.ViaVersion.util.ReflectionUtil;
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
import java.lang.reflect.Method;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@ -16,7 +17,22 @@ import java.util.UUID;
|
|||||||
public class VelocityStorage extends StoredObject {
|
public class VelocityStorage extends StoredObject {
|
||||||
private Player player;
|
private Player player;
|
||||||
private String currentServer;
|
private String currentServer;
|
||||||
private List<UUID> bossbar;
|
private List<UUID> cachedBossbar;
|
||||||
|
private static Method getServerBossBars;
|
||||||
|
private static Class<?> clientPlaySessionHandler;
|
||||||
|
private static Method getMinecraftConnection;
|
||||||
|
|
||||||
|
static {
|
||||||
|
try {
|
||||||
|
clientPlaySessionHandler = Class.forName("com.velocitypowered.proxy.connection.client.ClientPlaySessionHandler");
|
||||||
|
getServerBossBars = clientPlaySessionHandler
|
||||||
|
.getDeclaredMethod("getServerBossBars");
|
||||||
|
getMinecraftConnection = Class.forName("com.velocitypowered.proxy.connection.client.ConnectedPlayer")
|
||||||
|
.getDeclaredMethod("getMinecraftConnection");
|
||||||
|
} catch (NoSuchMethodException | ClassNotFoundException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public VelocityStorage(UserConnection user, Player player) {
|
public VelocityStorage(UserConnection user, Player player) {
|
||||||
super(user);
|
super(user);
|
||||||
@ -24,16 +40,22 @@ public class VelocityStorage extends StoredObject {
|
|||||||
this.currentServer = "";
|
this.currentServer = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
public void saveServerBossBars() {
|
public List<UUID> getBossbar() {
|
||||||
// Get bossbar list if it's supported
|
if (cachedBossbar == null) {
|
||||||
try {
|
if (clientPlaySessionHandler == null) return null;
|
||||||
Object connection = ReflectionUtil.invoke(player, "getMinecraftConnection");
|
if (getServerBossBars == null) return null;
|
||||||
Object sessionHandler = ReflectionUtil.invoke(connection, "getSessionHandler");
|
if (getMinecraftConnection == null) return null;
|
||||||
if (sessionHandler.getClass().getSimpleName().contains("Play")) {
|
// Get bossbar list if it's supported
|
||||||
bossbar = (List<UUID>) ReflectionUtil.invoke(sessionHandler, "getServerBossBars");
|
try {
|
||||||
|
Object connection = getMinecraftConnection.invoke(player);
|
||||||
|
Object sessionHandler = ReflectionUtil.invoke(connection, "getSessionHandler");
|
||||||
|
if (clientPlaySessionHandler.isInstance(sessionHandler)) {
|
||||||
|
cachedBossbar = (List<UUID>) getServerBossBars.invoke(sessionHandler);
|
||||||
|
}
|
||||||
|
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
|
return cachedBossbar;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user