Fix Player::getLanguageCode()

PoiCraft · Dec 2, 2022 · a5eaf62 · a5eaf62
1 parent 21ab7f3
commit a5eaf62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/LiteLoader/src/llapi/mc/PlayerAPI.cpp b/LiteLoader/src/llapi/mc/PlayerAPI.cpp
@@ -137,6 +137,7 @@ string Player::getLanguageCode() {
     if (isSimulatedPlayer()) {
         return I18n::getCurrentLanguage()->getFullLanguageCode();
     }
+    // std::cout << Global<ServerNetworkHandler> << " " << getNetworkIdentifier() << &Global<ServerNetworkHandler>->fetchConnectionRequest(*getNetworkIdentifier()) << "\n";
     auto map = Global<ServerNetworkHandler>->fetchConnectionRequest(*getNetworkIdentifier()).mRawToken.get()->mDataInfo.value_.map_;
     for (auto& iter : *map) {
         string s(iter.first.c_str());

diff --git a/LiteLoader/src/llapi/utils/GlobalService.cpp b/LiteLoader/src/llapi/utils/GlobalService.cpp
@@ -22,8 +22,9 @@ TInstanceHook(void, "?allowIncomingConnections@ServerNetworkHandler@@QEAAXAEBV?$
     static bool initd = false;
     if (!initd) {
         initd = true;
-        auto v3 = (ServerNetworkHandler*)((char*)this + 16);
-        Global<ServerNetworkHandler> = v3;
+        // auto v3 = (ServerNetworkHandler*)((char*)this + 16);
+        // +16 cause fetchConnectionRequest returns nullptr
+        Global<ServerNetworkHandler> = this;
     }
     original(this, a1, a2);
 }