From b41e9be4c9ca4c65f628697f9e63a129727b60e1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 24 Jun 2020 12:56:31 +1000
Subject: [PATCH] Constrain dimension to String|Integer

Fixes 1.8 server switch issues
---
 .../main/java/net/md_5/bungee/protocol/packet/Login.java    | 6 +++---
 .../main/java/net/md_5/bungee/protocol/packet/Respawn.java  | 2 +-
 proxy/src/main/java/net/md_5/bungee/ServerConnector.java    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java
index 58eb1f61..6ca80e2b 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java
@@ -74,7 +74,7 @@ public class Login extends DefinedPacket
             dimension = buf.readInt();
         } else
         {
-            dimension = buf.readByte();
+            dimension = (int) buf.readByte();
         }
         if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_15 )
         {
@@ -138,10 +138,10 @@ public class Login extends DefinedPacket
             writeString( worldName, buf );
         } else if ( protocolVersion > ProtocolConstants.MINECRAFT_1_9 )
         {
-            buf.writeInt( ( (Number) dimension ).intValue() );
+            buf.writeInt( (Integer) dimension );
         } else
         {
-            buf.writeByte( ( (Number) dimension ).byteValue() );
+            buf.writeByte( (Integer) dimension );
         }
         if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_15 )
         {
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Respawn.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Respawn.java
index 6a8c9c54..0d8068ea 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Respawn.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Respawn.java
@@ -68,7 +68,7 @@ public class Respawn extends DefinedPacket
             writeString( worldName, buf );
         } else
         {
-            buf.writeInt( ( (Number) dimension ).intValue() );
+            buf.writeInt( ( (Integer) dimension ) );
         }
         if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_15 )
         {
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 5c3c1ece..23a43b92 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -263,12 +263,12 @@ public class ServerConnector extends PacketHandler
             {
                 Object newDim;
                 String worldName = login.getWorldName();
-                if ( login.getDimension() instanceof Number )
+                if ( login.getDimension() instanceof Integer )
                 {
-                    newDim = ( ( (Number) login.getDimension() ).intValue() >= 0 ? -1 : 0 );
+                    newDim = ( (Integer) login.getDimension() >= 0 ? -1 : 0 );
                 } else
                 {
-                    newDim = worldName = ( "minecraft:overworld".equals( login.getDimension() ) ) ? "minecraft:the_nether" : "minecraft:overworld";
+                    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 ) );