PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

41b update

Browse Source
This commit is contained in:
md_5
2013-10-15 16:29:36 +11:00
parent 062dd38b2b
commit 18db20fe42
11 changed files with 91 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/src/main/java/net/md_5/bungee/PacketConstants.java
View File

@@ -7,8 +7,8 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
public class PacketConstants
{
public static final Respawn DIM1_SWITCH = new Respawn( (byte) 1, (byte) 0, (byte) 0, (short) 256, "DEFAULT" );
public static final Respawn DIM2_SWITCH = new Respawn( (byte) -1, (byte) 0, (byte) 0, (short) 256, "DEFAULT" );
public static final Respawn DIM1_SWITCH = new Respawn( (byte) 1, (byte) 0, (byte) 0 );
public static final Respawn DIM2_SWITCH = new Respawn( (byte) -1, (byte) 0, (byte) 0 );
public static final ClientStatus CLIENT_LOGIN = new ClientStatus( (byte) 0 );
public static final PluginMessage FORGE_MOD_REQUEST = new PluginMessage( "FML", new byte[]
{

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

@@ -22,7 +22,6 @@ import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.MinecraftOutput;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.protocol.packet.Login;
import net.md_5.bungee.protocol.packet.Respawn;
@@ -131,7 +130,7 @@ public class ServerConnector extends PacketHandler
user.setServerEntityId( login.getEntityId() );
// Set tab list size, this sucks balls, TODO: what shall we do about packet mutability
Login modLogin = new Login( login.getEntityId(), login.getLevelType(), login.getGameMode(), (byte) login.getDimension(), login.getDifficulty(), login.getUnused(),
Login modLogin = new Login( login.getEntityId(), login.getGameMode(), (byte) login.getDimension(), login.getDifficulty(),
(byte) user.getPendingConnection().getListener().getTabListSize() );
user.unsafe().sendPacket( modLogin );
@@ -157,7 +156,7 @@ public class ServerConnector extends PacketHandler
user.sendDimensionSwitch();
user.setServerEntityId( login.getEntityId() );
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getDifficulty(), login.getGameMode(), (short) 256, login.getLevelType() ) );
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getDifficulty(), login.getGameMode() ) );
// Remove from old servers
user.getServer().setObsolete( true );

8
proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
View File

@@ -1,7 +1,6 @@
package net.md_5.bungee.connection;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.EntityMap;
import net.md_5.bungee.UserConnection;
import net.md_5.bungee.Util;
import net.md_5.bungee.api.ProxyServer;
@@ -13,11 +12,12 @@ import net.md_5.bungee.netty.PacketHandler;
import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Chat;
import net.md_5.bungee.protocol.packet.TabComplete;
import net.md_5.bungee.protocol.packet.TabCompleteRequest;
import net.md_5.bungee.protocol.packet.ClientSettings;
import net.md_5.bungee.protocol.packet.PluginMessage;
import java.util.ArrayList;
import java.util.List;
import net.md_5.bungee.protocol.packet.TabCompleteResponse;
public class UpstreamBridge extends PacketHandler
{
@@ -93,7 +93,7 @@ public class UpstreamBridge extends PacketHandler
}
@Override
public void handle(TabComplete tabComplete) throws Exception
public void handle(TabCompleteRequest tabComplete) throws Exception
{
if ( tabComplete.getCursor().startsWith( "/" ) )
{
@@ -102,7 +102,7 @@ public class UpstreamBridge extends PacketHandler
if ( !results.isEmpty() )
{
con.unsafe().sendPacket( new TabComplete( results.toArray( new String[ results.size() ] ) ) );
con.unsafe().sendPacket( new TabCompleteResponse( results.toArray( new String[ results.size() ] ) ) );
throw new CancelSendSignal();
}
}