Hack to work around NPE during login

TODO: Fix properly
bundabrg · Dec 13, 2020 · 1954615 · 1954615
1 parent c0271a0
commit 1954615
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/connector/src/main/java/org/geysermc/connector/skin/SkinManager.java b/connector/src/main/java/org/geysermc/connector/skin/SkinManager.java
@@ -273,14 +273,14 @@ public static GameProfileData from(GameProfile profile) {
                 }
                 // return default skin with default cape when texture data is invalid
                 String skinUrl = isAlex ? SkinProvider.EMPTY_SKIN_ALEX.getTextureUrl() : SkinProvider.EMPTY_SKIN.getTextureUrl();
-                if ("steve".equals(skinUrl) || "alex".equals(skinUrl)) {
-                    for (GeyserSession session : GeyserConnector.getInstance().getPlayers()) {
-                        if (session.getPlayerEntity().getUuid().equals(profile.getId())) {
-                            skinUrl = session.getClientData().getSkinId();
-                            break;
-                        }
-                    }
-                }
+//                if ("steve".equals(skinUrl) || "alex".equals(skinUrl)) {
+//                    for (GeyserSession session : GeyserConnector.getInstance().getPlayers()) {
+//                        if (session.getPlayerEntity().getUuid().equals(profile.getId())) {
+//                            skinUrl = session.getClientData().getSkinId();
+//                            break;
+//                        }
+//                    }
+//                }
                 return new GameProfileData(skinUrl, SkinProvider.EMPTY_CAPE.getTextureUrl(), isAlex);
             }
         }

diff --git a/connector/src/main/resources/languages b/connector/src/main/resources/languages
+0 −0		run-help/af_ZA.txt
+18 −0		run-help/ar_SA.txt
+0 −18		run-help/cs_CZ.help.txt
+0 −18		run-help/da_DK.help.txt
+0 −18		run-help/de_DE.help.txt
+0 −18		run-help/el_GR.help.txt
+6 −6		run-help/el_GR.txt
+0 −18		run-help/en_GB.help.txt
+0 −18		run-help/en_US.help.txt
+0 −18		run-help/es_ES.help.txt
+1 −1		run-help/es_ES.txt
+1 −1		run-help/es_MX.txt
+0 −18		run-help/fi_FI.help.txt
+0 −18		run-help/fr_FR.help.txt
+18 −0		run-help/he_IL.txt
+19 −0		run-help/hi_IN.txt
+0 −18		run-help/hu_HU.help.txt
+1 −1		run-help/hu_HU.txt
+0 −18		run-help/id_ID.help.txt
+1 −1		run-help/id_ID.txt
+0 −18		run-help/it_IT.help.txt
+1 −1		run-help/it_IT.txt
+0 −18		run-help/ja_JP.help.txt
+1 −1		run-help/ja_JP.txt
+0 −18		run-help/ko_KR.help.txt
+6 −6		run-help/nb_NO.txt
+0 −18		run-help/nl_NL.help.txt
+2 −2		run-help/nl_NL.txt
+0 −18		run-help/no_NO.help.txt
+0 −18		run-help/pl_PL.help.txt
+6 −6		run-help/pt_BR.txt
+0 −18		run-help/pt_PT.help.txt
+0 −18		run-help/ru_RU.help.txt
+0 −18		run-help/sk_SK.help.txt
+0 −18		run-help/sv_SE.help.txt
+2 −2		run-help/sv_SE.txt
+0 −18		run-help/tr_TR.help.txt
+6 −6		run-help/tr_TR.txt
+0 −18		run-help/uk_UA.help.txt
+0 −18		run-help/zh_CN.help.txt
+0 −18		run-help/zh_TW.help.txt
+5 −5		run-help/zh_TW.txt
+182 −0		texts/af_ZA.properties
+182 −0		texts/ar_SA.properties
+145 −139		texts/bg_BG.properties
+11 −5		texts/cs_CZ.properties
+8 −2		texts/da_DK.properties
+17 −11		texts/de_DE.properties
+94 −88		texts/el_GR.properties
+9 −3		texts/en_GB.properties
+10 −3		texts/en_US.properties
+26 −20		texts/es_ES.properties
+26 −20		texts/es_MX.properties
+9 −3		texts/fi_FI.properties
+10 −4		texts/fr_CA.properties
+12 −6		texts/fr_FR.properties
+182 −0		texts/he_IL.properties
+182 −0		texts/hi_IN.properties
+9 −3		texts/hu_HU.properties
+24 −18		texts/id_ID.properties
+26 −20		texts/it_IT.properties
+16 −10		texts/ja_JP.properties
+35 −29		texts/ko_KR.properties
+123 −117		texts/nb_NO.properties
+79 −73		texts/nl_NL.properties
+9 −3		texts/pl_PL.properties
+179 −173		texts/pt_BR.properties
+9 −3		texts/pt_PT.properties
+10 −4		texts/ru_RU.properties
+9 −3		texts/sk_SK.properties
+24 −18		texts/sv_SE.properties
+161 −155		texts/tr_TR.properties
+9 −3		texts/uk_UA.properties
+25 −19		texts/zh_CN.properties
+9 −3		texts/zh_TW.properties