Skip to content

Commit 1d06e56

Browse files
committed
fix dedicated server crashes
1 parent 57056e8 commit 1d06e56

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/main/java/com/cleanroommc/modularui/api/MCHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import com.cleanroommc.modularui.api.drawable.IKey;
66

77
import net.minecraft.client.Minecraft;
8-
import net.minecraft.client.entity.EntityPlayerSP;
98
import net.minecraft.client.gui.FontRenderer;
109
import net.minecraft.client.gui.GuiScreen;
1110
import net.minecraft.client.util.ITooltipFlag;
11+
import net.minecraft.entity.player.EntityPlayer;
1212
import net.minecraft.item.ItemStack;
1313
import net.minecraft.util.text.TextFormatting;
1414
import net.minecraftforge.fluids.Fluid;
@@ -33,7 +33,7 @@ public static boolean hasMc() {
3333
return Minecraft.getMinecraft();
3434
}
3535

36-
public static @Nullable EntityPlayerSP getPlayer() {
36+
public static @Nullable EntityPlayer getPlayer() {
3737
if (hasMc()) {
3838
return getMc().player;
3939
}
@@ -42,7 +42,7 @@ public static boolean hasMc() {
4242

4343
public static boolean closeScreen() {
4444
if (!hasMc()) return false;
45-
EntityPlayerSP player = getPlayer();
45+
EntityPlayer player = getPlayer();
4646
if (player != null) {
4747
player.closeScreen();
4848
return true;

src/main/java/com/cleanroommc/modularui/screen/viewport/ModularGuiContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import com.cleanroommc.modularui.screen.UISettings;
1818

1919
import net.minecraft.client.Minecraft;
20-
import net.minecraft.client.entity.EntityPlayerSP;
2120
import net.minecraft.client.gui.GuiScreen;
21+
import net.minecraft.entity.player.EntityPlayer;
2222

2323
import org.jetbrains.annotations.ApiStatus;
2424
import org.jetbrains.annotations.NotNull;
@@ -255,7 +255,7 @@ public boolean hasDraggable() {
255255
}
256256

257257
public boolean isMouseItemEmpty() {
258-
EntityPlayerSP player = MCHelper.getPlayer();
258+
EntityPlayer player = MCHelper.getPlayer();
259259
return player == null || player.inventory.getItemStack().isEmpty();
260260
}
261261

src/main/java/com/cleanroommc/modularui/value/sync/ModularSyncManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.cleanroommc.modularui.value.sync;
22

33
import com.cleanroommc.modularui.ModularUI;
4+
import com.cleanroommc.modularui.network.NetworkUtils;
45
import com.cleanroommc.modularui.screen.ClientScreenHandler;
56
import com.cleanroommc.modularui.screen.ModularContainer;
67
import com.cleanroommc.modularui.widgets.slot.SlotGroup;
@@ -62,7 +63,7 @@ public void detectAndSendChanges(boolean init) {
6263
}
6364

6465
public void onClose() {
65-
if (ClientScreenHandler.guiIsClosing) {
66+
if (NetworkUtils.isClient() && ClientScreenHandler.guiIsClosing) {
6667
this.panelSyncManagerMap.values().forEach(PanelSyncManager::onClose);
6768
}
6869
}

0 commit comments

Comments
 (0)