From de08e5d0ac26db7e0c51ab9772882f1fa8acab12 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sun, 24 Jan 2016 06:54:46 -0500 Subject: [PATCH] Fixed crash when activating rituals on servers. --- changelog.txt | 6 ++++++ .../bloodmagic/api/util/helper/NetworkHelper.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/changelog.txt b/changelog.txt index 60c8b7c4..54dc0c81 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +------------------------------------------------------ +Version 2.0.0-8 +------------------------------------------------------ +- Fixed crash when activating rituals while operating on servers +- Added the majority of stuff for the item routing system. + ------------------------------------------------------ Version 2.0.0-7 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java index 9e490436..f806dfa1 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java @@ -8,7 +8,9 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.relauncher.Side; import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.event.AddToNetworkEvent; @@ -31,6 +33,11 @@ public class NetworkHelper */ public static SoulNetwork getSoulNetwork(String name) { + if (FMLCommonHandler.instance().getSide() == Side.CLIENT) + { + return new SoulNetwork(name); + } + World world = DimensionManager.getWorld(0); SoulNetwork network = (SoulNetwork) world.getMapStorage().loadData(SoulNetwork.class, name);