0.8.15 hotfix, fixes #234

refinedmods · Aug 1, 2016 · 2215f27 · 2215f27
1 parent 4b42173
commit 2215f27
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Refined Storage Changelog
 
+### 0.8.15
+**Bugfixes**
+- Fixed server startup crash
+
 ### 0.8.14
 **Features**
 - Added Interdimensional Upgrade so the Network Transmitter can work over different dimensions

diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "0.8.14"
+version = "0.8.15"
 group = "refinedstorage"
 archivesBaseName = "refinedstorage"
 

diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java
@@ -23,7 +23,7 @@
 @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION)
 public final class RefinedStorage {
     public static final String ID = "refinedstorage";
-    public static final String VERSION = "0.8.14";
+    public static final String VERSION = "0.8.15";
 
     @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy")
     public static CommonProxy PROXY;

diff --git a/src/main/java/refinedstorage/api/network/INetworkNode.java b/src/main/java/refinedstorage/api/network/INetworkNode.java
@@ -68,5 +68,5 @@ public interface INetworkNode {
     /**
      * @return The world where this node is in
      */
-    World getWorld();
+    World getNodeWorld();
 }
diff --git a/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java
@@ -118,13 +118,13 @@ public World getWorld() {
 
         if (notify) {
             for (INetworkNode newNode : nodes) {
-                if (!oldNodeHashes.contains(hashNode(newNode.getWorld(), newNode))) {
+                if (!oldNodeHashes.contains(hashNode(newNode.getNodeWorld(), newNode))) {
                     newNode.onConnected(controller);
                 }
             }
 
             for (INetworkNode oldNode : oldNodes) {
-                if (!nodeHashes.contains(hashNode(oldNode.getWorld(), oldNode))) {
+                if (!nodeHashes.contains(hashNode(oldNode.getNodeWorld(), oldNode))) {
                     oldNode.onDisconnected(controller);
                 }
             }

diff --git a/src/main/java/refinedstorage/tile/TileNode.java b/src/main/java/refinedstorage/tile/TileNode.java
@@ -4,6 +4,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.INetworkNode;
 import refinedstorage.apiimpl.network.NetworkUtils;
@@ -95,6 +96,11 @@ public INetworkMaster getNetwork() {
         return network;
     }
 
+    @Override
+    public World getNodeWorld() {
+        return worldObj;
+    }
+
     @Override
     public BlockPos getPosition() {
         return pos;

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
       "modid": "refinedstorage",
       "name": "Refined Storage",
       "description": "A Minecraft mod all about storage.",
-      "version": "0.8.14",
+      "version": "0.8.15",
       "mcversion": "1.10.2",
       "url": "",
       "updateUrl": "",