Resolve merge conflicts

HexagonMC · Dec 18, 2019 · 04fbd69 · 04fbd69
1 parent 4d6f19c
commit 04fbd69
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -237,12 +237,12 @@ public void handle(Login login) throws Exception
             if ( handshakeHandler != null && handshakeHandler.isServerForge() )
             {
                 modLogin = new Login( login.getEntityId(), login.getGameMode(), login.getDimension(), login.getSeed(), login.getDifficulty(),
-                        (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo() );
+                        (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn() );
             }
             else
             {
                 modLogin = new Login( login.getEntityId(), login.getGameMode(), (byte) login.getDimension(), login.getSeed(), login.getDifficulty(),
-                        (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo() );
+                        (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn() );
             }
 
             user.unsafe().sendPacket( modLogin );