Fix server crash

lazyMods · Mar 22, 2020 · bdff2e3 · bdff2e3
1 parent 906a8eb
commit bdff2e3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/main/java/com/lazy/baubles/Baubles.java b/src/main/java/com/lazy/baubles/Baubles.java
@@ -38,7 +38,7 @@ public static class Registration {
         public static List<ContainerType<?>> CONTAINERS = new ArrayList<>();
 
         @ObjectHolder("baubles:player_baubles")
-        public static ContainerType<PlayerExpandedContainer> PLAYER_BAUBLES = createContainer("player_baubles", PlayerExpandedContainer::new);
+        public static ContainerType<PlayerExpandedContainer> PLAYER_BAUBLES = createContainer("player_baubles", (id, inv, data) -> new PlayerExpandedContainer(id, inv, !inv.player.world.isRemote));
 
         private static <T extends Container> ContainerType<T> createContainer(String name, IContainerFactory<T> factory) {
             ContainerType<T> containerType = IForgeContainerType.create(factory);

diff --git a/src/main/java/com/lazy/baubles/client/util/GuiProvider.java b/src/main/java/com/lazy/baubles/client/util/GuiProvider.java
@@ -20,6 +20,6 @@ public ITextComponent getDisplayName() {
     @Nullable
     @Override
     public Container createMenu(int id, PlayerInventory playerInventory, PlayerEntity playerEntity) {
-        return new PlayerExpandedContainer(id, playerInventory, !playerEntity.world.isRemote, playerEntity);
+        return new PlayerExpandedContainer(id, playerInventory, !playerEntity.world.isRemote);
     }
 }
diff --git a/src/main/java/com/lazy/baubles/container/PlayerExpandedContainer.java b/src/main/java/com/lazy/baubles/container/PlayerExpandedContainer.java
@@ -38,16 +38,12 @@ public class PlayerExpandedContainer extends Container {
 
     public IBaublesItemHandler baubles;
 
-    public PlayerExpandedContainer(int id, PlayerInventory inventory, PacketBuffer buffer) {
-        this(id, inventory, !Minecraft.getInstance().world.isRemote, Minecraft.getInstance().player);
-    }
-
-    public PlayerExpandedContainer(int id, PlayerInventory playerInventory, boolean localWorld, PlayerEntity playerIn) {
+    public PlayerExpandedContainer(int id, PlayerInventory playerInventory, boolean localWorld) {
         super(Baubles.Registration.PLAYER_BAUBLES, id);
         this.isLocalWorld = localWorld;
-        this.player = playerIn;
+        this.player = playerInventory.player;
 
-        this.baubles = player.getCapability(BaublesCapabilities.BAUBLES).orElseThrow(NullPointerException::new);
+        this.baubles = this.player.getCapability(BaublesCapabilities.BAUBLES).orElseThrow(NullPointerException::new);
 
         this.addSlot(new CraftingResultSlot(playerInventory.player, this.craftMatrix, this.craftResult, 0, 154, 28));