From 10ce71efe3d264a8df80185c4774abd30ceab521 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Fri, 27 Oct 2017 14:21:12 +0200 Subject: [PATCH] Fix mapwriter crash when opening replay for ci) { + if (currentServerData == null + && (Loader.isModLoaded("mapwriter") || Loader.isModLoaded("MapWriter")) + && ReplayModReplay.instance.getReplayHandler() != null) { + for (StackTraceElement elem : Thread.currentThread().getStackTrace()) { + if ("mapwriter.util.Utils".equals(elem.getClassName()) && "getWorldName".equals(elem.getMethodName())) { + ci.setReturnValue(new ServerData(null, "replay")); + return; + } + } + } + } +} diff --git a/src/main/java/com/replaymod/core/LoadingPlugin.java b/src/main/java/com/replaymod/core/LoadingPlugin.java index 9a251ed9..ebc8df0b 100755 --- a/src/main/java/com/replaymod/core/LoadingPlugin.java +++ b/src/main/java/com/replaymod/core/LoadingPlugin.java @@ -19,6 +19,7 @@ public class LoadingPlugin implements IFMLLoadingPlugin { Mixins.addConfiguration("mixins.recording.replaymod.json"); Mixins.addConfiguration("mixins.render.replaymod.json"); Mixins.addConfiguration("mixins.replay.replaymod.json"); + Mixins.addConfiguration("mixins.compat.mapwriter.replaymod.json"); Mixins.addConfiguration("mixins.compat.shaders.replaymod.json"); Mixins.addConfiguration("mixins.extras.playeroverview.replaymod.json"); diff --git a/src/main/resources/mixins.compat.mapwriter.replaymod.json b/src/main/resources/mixins.compat.mapwriter.replaymod.json new file mode 100644 index 00000000..4b5d0287 --- /dev/null +++ b/src/main/resources/mixins.compat.mapwriter.replaymod.json @@ -0,0 +1,11 @@ +{ + "required": false, + "package": "com.replaymod.compat.mapwriter.mixin", + "mixins": [], + "server": [], + "client": [ + "MixinMinecraft" + ], + "compatibilityLevel": "JAVA_8", + "refmap": "mixins.replaymod.refmap.json" +} \ No newline at end of file