From 7bed808838202af576b47340887d59f4480fe6a0 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 31 Dec 2019 17:41:59 +0000
Subject: $ Fixed Client-Side Minecraft instance being accessed from
 Server-Side.

---
 src/Java/gtPlusPlus/core/util/Utils.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index c73f9ee7a4..234b54d2d2 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -497,14 +497,13 @@ public class Utils {
 		return true;
 	}
 
-	public static File getMcDir() {		
-		if (Minecraft.getMinecraft() == null) {
-			return new File("testdir");
-		}		
-		if ((MinecraftServer.getServer() != null) && MinecraftServer.getServer().isDedicatedServer()) {
-			return new File(".");
+	public static File getMcDir() {	
+		if (Utils.isClient()) {
+			if (Minecraft.getMinecraft() != null) {
+				return Minecraft.getMinecraft().mcDataDir;
+			}
 		}
-		return Minecraft.getMinecraft().mcDataDir;
+		return new File(".");
 	}
 
 	private static short cellID = 15;
-- 
cgit