PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#2861: Improve dimension changing support in 1.16.x

Browse Source
This commit is contained in:
FivePB (Xer) 2020-06-25 08:08:54 +10:00 committed by md_5
parent c5f839c9ad
commit e1084bd913
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
proxy/src/main/java/net/md_5/bungee/ServerConnector.java
View File

@ -205,7 +205,7 @@ public class ServerConnector extends PacketHandler
user.getForgeClientHandler().setHandshakeComplete(); user.getForgeClientHandler().setHandshakeComplete();
} }
if ( user.getServer() == null ) if ( user.getServer() == null || !( login.getDimension() instanceof Integer ) )
{ {
// Once again, first connection // Once again, first connection
user.setClientEntityId( login.getEntityId() ); user.setClientEntityId( login.getEntityId() );
@ -217,10 +217,18 @@ public class ServerConnector extends PacketHandler
user.unsafe().sendPacket( modLogin ); user.unsafe().sendPacket( modLogin );
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer(); if ( user.getServer() != null )
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand ); {
user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", DefinedPacket.toArray( brand ), handshakeHandler.isServerForge() ) ); user.getServer().setObsolete( true );
brand.release(); user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
user.getServer().disconnect( "Quitting" );
} else
{
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", DefinedPacket.toArray( brand ), handshakeHandler.isServerForge() ) );
brand.release();
}
user.setDimension( login.getDimension() ); user.setDimension( login.getDimension() );
} else } else
@ -259,19 +267,9 @@ public class ServerConnector extends PacketHandler
} }
user.setDimensionChange( true ); user.setDimensionChange( true );
if ( login.getDimension().equals( user.getDimension() ) ) if ( login.getDimension() == user.getDimension() )
{ {
Object newDim; user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
String worldName = login.getWorldName();
if ( login.getDimension() instanceof Integer )
{
newDim = ( (Integer) login.getDimension() >= 0 ? -1 : 0 );
} else
{
newDim = worldName = ( "minecraft:overworld".equals( (String) login.getDimension() ) ) ? "minecraft:the_nether" : "minecraft:overworld";
}
user.unsafe().sendPacket( new Respawn( newDim, worldName, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
} }
user.setServerEntityId( login.getEntityId() ); user.setServerEntityId( login.getEntityId() );