Fix probable NPE

Jikoo · Sep 23, 2023 · 21cd52c · 21cd52c
1 parent 9d715b6
commit 21cd52c
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/internal/v1_20_R2/src/main/java/com/lishid/openinv/internal/v1_20_R2/PlayerDataManager.java b/internal/v1_20_R2/src/main/java/com/lishid/openinv/internal/v1_20_R2/PlayerDataManager.java
@@ -21,15 +21,15 @@
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.OpenInventoryView;
 import com.mojang.authlib.GameProfile;
-import java.lang.reflect.Field;
-import java.util.logging.Logger;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.ChatVisiblity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.Level;
@@ -45,6 +45,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Field;
+import java.util.logging.Logger;
+
 public class PlayerDataManager implements IPlayerDataManager {
 
     private @Nullable Field bukkitEntity;
@@ -99,7 +102,18 @@ public PlayerDataManager() {
             return null;
         }
 
-        ServerPlayer entity = new ServerPlayer(server, worldServer, profile, null);
+        ClientInformation dummyInfo = new ClientInformation(
+            "en_us",
+            1, // Reduce distance just in case.
+            ChatVisiblity.HIDDEN, // Don't accept chat.
+            false,
+            ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
+            ServerPlayer.DEFAULT_MAIN_HAND,
+            true,
+            false // Don't list in player list (not that this player is in the list anyway).
+        );
+
+        ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
 
         // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
         entity.getAdvancements().stopListening();