Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-11-30 14:13:47 +01:00
Code Issues Projects Releases Wiki Activity

Only double switch if the dimension is the same. (#1977)

Browse Source 
According to the protocol, a double respawn packet is only needed to be
sent if from the same dimension, so by storing the last known dimension,
we are able to compare and avoid the double packet.

This also maintains the same behaviour for Spigot
ad2f806097
This commit is contained in:
Mystiflow 2016-10-29 07:59:38 +01:00 committed by md-5
parent 75b7fdac58
commit 812141f400
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,10 +222,15 @@ public class ServerConnector extends PacketHandler
} }
user.getSentBossBars().clear(); user.getSentBossBars().clear();
user.sendDimensionSwitch(); user.setDimensionChange( true );
if ( login.getDimension() == user.getDimension() )
{
user.unsafe().sendPacket( new Respawn( ( login.getDimension() >= 0 ? -1 : 0 ), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) );
}
user.setServerEntityId( login.getEntityId() ); user.setServerEntityId( login.getEntityId() );
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) ); user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) );
user.setDimension( login.getDimension() );
// Remove from old servers // Remove from old servers
user.getServer().disconnect( "Quitting" ); user.getServer().disconnect( "Quitting" );

15
proxy/src/main/java/net/md_5/bungee/UserConnection.java
View File

@ -55,6 +55,7 @@ import net.md_5.bungee.protocol.packet.ClientSettings;
import net.md_5.bungee.protocol.packet.Kick; import net.md_5.bungee.protocol.packet.Kick;
import net.md_5.bungee.protocol.packet.PlayerListHeaderFooter; import net.md_5.bungee.protocol.packet.PlayerListHeaderFooter;
import net.md_5.bungee.protocol.packet.PluginMessage; import net.md_5.bungee.protocol.packet.PluginMessage;
import net.md_5.bungee.protocol.packet.Respawn;
import net.md_5.bungee.protocol.packet.SetCompression; import net.md_5.bungee.protocol.packet.SetCompression;
import net.md_5.bungee.tab.ServerUnique; import net.md_5.bungee.tab.ServerUnique;
import net.md_5.bungee.tab.TabList; import net.md_5.bungee.tab.TabList;
@ -80,6 +81,9 @@ public final class UserConnection implements ProxiedPlayer
private ServerConnection server; private ServerConnection server;
@Getter @Getter
@Setter @Setter
private int dimension;
@Getter
@Setter
private boolean dimensionChange = true; private boolean dimensionChange = true;
@Getter @Getter
private final Collection<ServerInfo> pendingConnects = new HashSet<>(); private final Collection<ServerInfo> pendingConnects = new HashSet<>();
@ -210,17 +214,10 @@ public final class UserConnection implements ProxiedPlayer
connect( target, callback, false ); connect( target, callback, false );
} }
void sendDimensionSwitch()
{
dimensionChange = true;
unsafe().sendPacket( PacketConstants.DIM1_SWITCH );
unsafe().sendPacket( PacketConstants.DIM2_SWITCH );
}
public void connectNow(ServerInfo target) public void connectNow(ServerInfo target)
{ {
sendDimensionSwitch(); dimensionChange = true;
connect( target ); connect(target);
} }
public ServerInfo updateAndGetNextServer(ServerInfo currentTarget) public ServerInfo updateAndGetNextServer(ServerInfo currentTarget)

7
proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
View File

@ -33,6 +33,7 @@ import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.packet.BossBar; import net.md_5.bungee.protocol.packet.BossBar;
import net.md_5.bungee.protocol.packet.KeepAlive; import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.PlayerListItem; import net.md_5.bungee.protocol.packet.PlayerListItem;
import net.md_5.bungee.protocol.packet.Respawn;
import net.md_5.bungee.protocol.packet.ScoreboardObjective; import net.md_5.bungee.protocol.packet.ScoreboardObjective;
import net.md_5.bungee.protocol.packet.ScoreboardScore; import net.md_5.bungee.protocol.packet.ScoreboardScore;
import net.md_5.bungee.protocol.packet.ScoreboardDisplay; import net.md_5.bungee.protocol.packet.ScoreboardDisplay;
@ -504,6 +505,12 @@ public class DownstreamBridge extends PacketHandler
} }
} }
@Override
public void handle(Respawn respawn)
{
con.setDimension( respawn.getDimension() );
}
@Override @Override
public String toString() public String toString()
{ {