Merge pull request #34 from SpigotMC/master

[pull] master from SpigotMC:master

Author: pull[bot]

protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java

@@ -12,12 +12,17 @@
 public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
 {
 
+    public MinecraftDecoder(Protocol protocol, boolean server, int protocolVersion)
+    {
+        this( protocol, server, protocolVersion, shouldCopyBuffer( protocol, protocolVersion ) );
+    }
+
     @Getter
-    @Setter
     private Protocol protocol;
     private final boolean server;
     @Setter
     private int protocolVersion;
+    private boolean copyBuffer;
 
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
@@ -30,8 +35,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) t
         }
 
         Protocol.DirectionData prot = ( server ) ? protocol.TO_SERVER : protocol.TO_CLIENT;
-        ByteBuf slice = in.copy(); // Can't slice this one due to EntityMap :(
-
+        ByteBuf slice = ( copyBuffer ) ? in.copy() : in.retainedSlice();
         try
         {
             int packetId = DefinedPacket.readVarInt( in );
@@ -60,4 +64,17 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) t
             }
         }
     }
+
+    public void setProtocol(Protocol protocol)
+    {
+        this.protocol = protocol;
+        this.copyBuffer = shouldCopyBuffer( protocol, protocolVersion );
+    }
+
+    private static boolean shouldCopyBuffer(Protocol protocol, int protocolVersion)
+    {
+        // We only use the entity map in game state, we can avoid many buffer copies by checking this
+        // EntityMap is removed for 1.20.2 and up
+        return protocol == Protocol.GAME && protocolVersion < ProtocolConstants.MINECRAFT_1_20_2;
+    }
 }

proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java

@@ -55,6 +55,7 @@
 import net.md_5.bungee.protocol.ProtocolConstants;
 import net.md_5.bungee.protocol.packet.BossBar;
 import net.md_5.bungee.protocol.packet.Commands;
+import net.md_5.bungee.protocol.packet.FinishConfiguration;
 import net.md_5.bungee.protocol.packet.KeepAlive;
 import net.md_5.bungee.protocol.packet.Kick;
 import net.md_5.bungee.protocol.packet.Login;
@@ -801,6 +802,16 @@ public void handle(Login login) throws Exception
         throw CancelSendSignal.INSTANCE;
     }
 
+    @Override
+    public void handle(FinishConfiguration finishConfiguration) throws Exception
+    {
+        // the clients protocol will change to GAME after this packet
+        con.unsafe().sendPacket( finishConfiguration );
+        // send queued packets as early as possible
+        con.sendQueuedPackets();
+        throw CancelSendSignal.INSTANCE;
+    }
+
     @Override
     public String toString()
     {

proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java

@@ -33,7 +33,6 @@
 import net.md_5.bungee.protocol.packet.ClientCommand;
 import net.md_5.bungee.protocol.packet.ClientSettings;
 import net.md_5.bungee.protocol.packet.CookieResponse;
-import net.md_5.bungee.protocol.packet.FinishConfiguration;
 import net.md_5.bungee.protocol.packet.KeepAlive;
 import net.md_5.bungee.protocol.packet.LoginAcknowledged;
 import net.md_5.bungee.protocol.packet.LoginPayloadResponse;
@@ -367,12 +366,6 @@ private void configureServer()
         }
     }
 
-    @Override
-    public void handle(FinishConfiguration finishConfiguration) throws Exception
-    {
-        con.sendQueuedPackets();
-    }
-
     @Override
     public void handle(CookieResponse cookieResponse) throws Exception
     {

proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java

@@ -82,21 +82,9 @@ public static EntityMap getEntityMap(int version)
             case ProtocolConstants.MINECRAFT_1_19_4:
             case ProtocolConstants.MINECRAFT_1_20:
                 return EntityMap_1_16_2.INSTANCE_1_19_4;
-            case ProtocolConstants.MINECRAFT_1_20_2:
-                return EntityMap_1_16_2.INSTANCE_1_20_2;
-            case ProtocolConstants.MINECRAFT_1_20_3:
-                return EntityMap_1_16_2.INSTANCE_1_20_3;
-            case ProtocolConstants.MINECRAFT_1_20_5:
-            case ProtocolConstants.MINECRAFT_1_21:
-                return EntityMap_1_16_2.INSTANCE_1_20_5;
-            case ProtocolConstants.MINECRAFT_1_21_2:
-                return EntityMap_1_16_2.INSTANCE_1_21_2;
-            case ProtocolConstants.MINECRAFT_1_21_4:
-                return EntityMap_1_16_2.INSTANCE_1_21_4;
-            case ProtocolConstants.MINECRAFT_1_21_5:
-                return EntityMap_1_16_2.INSTANCE_1_21_5;
+            default:
+                return null;
         }
-        throw new RuntimeException( "Version " + version + " has no entity map" );
     }
 
     protected void addRewrite(int id, ProtocolConstants.Direction direction, boolean varint)

proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_16_2.java

@@ -20,12 +20,6 @@ class EntityMap_1_16_2 extends EntityMap
     static final EntityMap_1_16_2 INSTANCE_1_19 = new EntityMap_1_16_2( 0x02, 0x2F );
     static final EntityMap_1_16_2 INSTANCE_1_19_1 = new EntityMap_1_16_2( 0x02, 0x30 );
     static final EntityMap_1_16_2 INSTANCE_1_19_4 = new EntityMap_1_16_2( 0x03, 0x30 );
-    static final EntityMap_1_16_2 INSTANCE_1_20_2 = new EntityMap_1_16_2( -1, 0x33 );
-    static final EntityMap_1_16_2 INSTANCE_1_20_3 = new EntityMap_1_16_2( -1, 0x34 );
-    static final EntityMap_1_16_2 INSTANCE_1_20_5 = new EntityMap_1_16_2( -1, 0x37 );
-    static final EntityMap_1_16_2 INSTANCE_1_21_2 = new EntityMap_1_16_2( -1, 0x39 );
-    static final EntityMap_1_16_2 INSTANCE_1_21_4 = new EntityMap_1_16_2( -1, 0x3B );
-    static final EntityMap_1_16_2 INSTANCE_1_21_5 = new EntityMap_1_16_2( -1, 0x3C );
     //
     private final int spawnPlayerId;
     private final int spectateId;