Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-23 02:25:19 +01:00
Code Issues Projects Releases Wiki Activity

Fix getting connection twice

Browse Source
This commit is contained in:
Myles 2016-11-15 08:17:15 +00:00
parent bee260e2b4
commit bf01c9ea0e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bungee/src/main/java/us/myles/ViaVersion/bungee/handlers/BungeeServerHandler.java
View File

@ -76,7 +76,7 @@ public class BungeeServerHandler implements Listener {
}
public void checkServerChange(ServerConnectedEvent e, UserConnection user) throws Exception {
if(user == null) return;
if (user == null) return;
if (user.has(BungeeStorage.class)) {
BungeeStorage storage = user.get(BungeeStorage.class);
ProxiedPlayer player = storage.getPlayer();
@ -89,12 +89,11 @@ public class BungeeServerHandler implements Listener {
int protocolId = ProtocolDetectorService.getProtocolId(serverName);
UserConnection viaConnection = Via.getManager().getConnection(player.getUniqueId());
ProtocolInfo info = viaConnection.get(ProtocolInfo.class);
ProtocolInfo info = user.get(ProtocolInfo.class);
// Refresh the pipes
List<Pair<Integer, Protocol>> protocols = ProtocolRegistry.getProtocolPath(info.getProtocolVersion(), protocolId);
ProtocolPipeline pipeline = viaConnection.get(ProtocolInfo.class).getPipeline();
viaConnection.clearStoredObjects();
ProtocolPipeline pipeline = user.get(ProtocolInfo.class).getPipeline();
user.clearStoredObjects();
pipeline.cleanPipes();
if (protocols == null) {
// TODO Check Bungee Supported Protocols? *shrugs*
@ -105,14 +104,14 @@ public class BungeeServerHandler implements Listener {
}
}
viaConnection.put(info);
viaConnection.put(storage);
user.put(info);
user.put(storage);
viaConnection.setActive(protocols != null);
user.setActive(protocols != null);
// Init all protocols TODO check if this can get moved up to the previous for loop, and doesn't require the pipeline to already exist.
for (Protocol protocol : pipeline.pipes()) {
protocol.init(viaConnection);
protocol.init(user);
}
Object wrapper = channelWrapper.get(player);