Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-09-17 01:23:43 +02:00
Code Issues Releases Aktivität

Merge pull request #1263 from creeper123123321/master

Quellcode durchsuchen 
Check SessionHandler type before getting knownChannels
Dieser Commit ist enthalten in:
Myles 2019-04-21 23:35:59 +01:00 committet von GitHub
Commit 5f670a88a4
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 29 neuen und 25 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

54
velocity/src/main/java/us/myles/ViaVersion/velocity/handlers/VelocityServerHandler.java
Datei anzeigen

@ -34,6 +34,7 @@ public class VelocityServerHandler {
private static Method getMinecraftConnection; private static Method getMinecraftConnection;
private static Method getNextProtocolVersion; private static Method getNextProtocolVersion;
private static Method getKnownChannels; private static Method getKnownChannels;
private static Class<?> clientPlaySessionHandler;
static { static {
try { try {
@ -45,7 +46,8 @@ public class VelocityServerHandler {
.getDeclaredMethod("getMinecraftConnection"); .getDeclaredMethod("getMinecraftConnection");
getNextProtocolVersion = Class.forName("com.velocitypowered.proxy.connection.MinecraftConnection") getNextProtocolVersion = Class.forName("com.velocitypowered.proxy.connection.MinecraftConnection")
.getDeclaredMethod("getNextProtocolVersion"); .getDeclaredMethod("getNextProtocolVersion");
getKnownChannels = Class.forName("com.velocitypowered.proxy.connection.client.ClientPlaySessionHandler") clientPlaySessionHandler = Class.forName("com.velocitypowered.proxy.connection.client.ClientPlaySessionHandler");
getKnownChannels = clientPlaySessionHandler
.getDeclaredMethod("getKnownChannels"); .getDeclaredMethod("getKnownChannels");
} catch (NoSuchMethodException | ClassNotFoundException e) { } catch (NoSuchMethodException | ClassNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
@ -144,34 +146,36 @@ public class VelocityServerHandler {
pipeline.add(ProtocolRegistry.getBaseProtocol(protocolId)); pipeline.add(ProtocolRegistry.getBaseProtocol(protocolId));
// Workaround 1.13 server change // Workaround 1.13 server change
Set<String> knownChannels = (Set<String>) getKnownChannels.invoke( Object sessionHandler = ReflectionUtil.invoke(
ReflectionUtil.invoke( getMinecraftConnection.invoke(e.getPlayer()),
getMinecraftConnection.invoke(e.getPlayer()), "getSessionHandler"
"getSessionHandler"
)
); );
if (previousServerProtocol != -1) {
int id1_13 = ProtocolVersion.MINECRAFT_1_13.getProtocol(); if (clientPlaySessionHandler.isInstance(sessionHandler)) { // It may be InitialConnectSessionHandler on the first server connection
if (previousServerProtocol < id1_13 && protocolId >= id1_13) { Set<String> knownChannels = (Set<String>) getKnownChannels.invoke(sessionHandler);
ArrayList<String> newChannels = new ArrayList<>(); if (previousServerProtocol != -1) {
for (String oldChannel : knownChannels) { int id1_13 = ProtocolVersion.MINECRAFT_1_13.getProtocol();
String transformed = InventoryPackets.getNewPluginChannelId(oldChannel); if (previousServerProtocol < id1_13 && protocolId >= id1_13) {
if (transformed != null) { ArrayList<String> newChannels = new ArrayList<>();
newChannels.add(transformed); for (String oldChannel : knownChannels) {
String transformed = InventoryPackets.getNewPluginChannelId(oldChannel);
if (transformed != null) {
newChannels.add(transformed);
}
} }
} knownChannels.clear();
knownChannels.clear(); knownChannels.addAll(newChannels);
knownChannels.addAll(newChannels); } else if (previousServerProtocol >= id1_13 && protocolId < id1_13) {
} else if (previousServerProtocol >= id1_13 && protocolId < id1_13) { ArrayList<String> newChannels = new ArrayList<>();
ArrayList<String> newChannels = new ArrayList<>(); for (String oldChannel : knownChannels) {
for (String oldChannel : knownChannels) { String transformed = InventoryPackets.getOldPluginChannelId(oldChannel);
String transformed = InventoryPackets.getOldPluginChannelId(oldChannel); if (transformed != null) {
if (transformed != null) { newChannels.add(transformed);
newChannels.add(transformed); }
} }
knownChannels.clear();
knownChannels.addAll(newChannels);
} }
knownChannels.clear();
knownChannels.addAll(newChannels);
} }
} }