diff --git a/compat/BungeeCord.patch b/compat/BungeeCord.patch old mode 100644 new mode 100755 index 94102ad..c3ec4eb --- a/compat/BungeeCord.patch +++ b/compat/BungeeCord.patch @@ -1,5 +1,5 @@ diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index 48f56b3..96d748e 100644 +index 48f56b3..238ab60 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -58,6 +58,7 @@ @@ -27,15 +27,17 @@ return; } diff --git a/pom.xml b/pom.xml -index 7ebde38..a94d818 100644 +index 7ebde38..b327a25 100644 --- a/pom.xml +++ b/pom.xml -@@ -66,8 +66,8 @@ +@@ -65,9 +65,9 @@ + unknown - 4.0.33.Final +- 4.0.33.Final - 1.7 - 1.7 ++ 4.0.34.Final + 1.8 + 1.8 UTF-8 @@ -88,7 +90,7 @@ org.apache.maven.plugins diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index ce78e19..dcf2240 100644 +index bcc6f9a..7829b8b 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -60,6 +60,9 @@ import net.md_5.bungee.protocol.packet.StatusRequest; @@ -101,14 +103,14 @@ @RequiredArgsConstructor public class InitialHandler extends PacketHandler implements PendingConnection { -@@ -383,35 +386,26 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -383,35 +386,25 @@ public class InitialHandler extends PacketHandler implements PendingConnection { sha.update( bit ); } - String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" ); - - String authURL = "https://sessionserver.mojang.com/session/minecraft/hasJoined?username=" + encName + "&serverId=" + encodedHash; - +- - Callback handler = new Callback() - { - @Override @@ -155,7 +157,7 @@ private void finish() diff --git a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java b/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java -index 9311ef7..1126a58 100644 +index 9311ef7..98bba42 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java @@ -3,6 +3,17 @@ package net.md_5.bungee.connection; @@ -176,7 +178,7 @@ @Data @AllArgsConstructor public class LoginResult -@@ -11,6 +22,22 @@ public class LoginResult +@@ -11,6 +22,20 @@ public class LoginResult private String id; private Property[] properties; @@ -185,13 +187,11 @@ + List properitesList = new ArrayList<>(4); + if(pp.skin != null) { + properitesList.add(new Property(ClientLauncher.SKIN_URL_PROPERTY, pp.skin.url, "")); -+ properitesList.add(new Property(ClientLauncher.SKIN_DIGEST_PROPERTY, -+ SecurityHelper.toHex(pp.skin.digest), "")); ++ properitesList.add(new Property(ClientLauncher.SKIN_DIGEST_PROPERTY, SecurityHelper.toHex(pp.skin.digest), "")); + } + if(pp.cloak != null) { + properitesList.add(new Property(ClientLauncher.CLOAK_URL_PROPERTY, pp.cloak.url, "")); -+ properitesList.add(new Property(ClientLauncher.CLOAK_DIGEST_PROPERTY, -+ SecurityHelper.toHex(pp.cloak.digest), "")); ++ properitesList.add(new Property(ClientLauncher.CLOAK_DIGEST_PROPERTY, SecurityHelper.toHex(pp.cloak.digest), "")); + } + properties = properitesList.toArray(new Property[properitesList.size()]); + }