aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-12-31 17:41:59 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-12-31 17:41:59 +0000
commit7bed808838202af576b47340887d59f4480fe6a0 (patch)
treed171870fb7d6ecb8790277e46cfe9aa1f06dc8dd
parent48a078e6a9826cb58dd19cc3fb382f460114f8f7 (diff)
downloadGT5-Unofficial-7bed808838202af576b47340887d59f4480fe6a0.tar.gz
GT5-Unofficial-7bed808838202af576b47340887d59f4480fe6a0.tar.bz2
GT5-Unofficial-7bed808838202af576b47340887d59f4480fe6a0.zip
$ Fixed Client-Side Minecraft instance being accessed from Server-Side.
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java13
1 files changed, 6 insertions, 7 deletions
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;