From bd77abe4f99b233d77a8fd6c2e6f5ec3fca25836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Fri, 27 Feb 2015 07:06:09 +0100
Subject: [PATCH] Fixes #943.

---
 build.properties                                  |  2 +-
 src/main/scala/li/cil/oc/common/SaveHandler.scala | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.properties b/build.properties
index f60938a46..5377f47e5 100644
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,5 @@
 minecraft.version=1.8
-forge.version=11.14.1.1313
+forge.version=11.14.1.1329
 
 oc.version=1.5.2
 oc.subversion=dev
diff --git a/src/main/scala/li/cil/oc/common/SaveHandler.scala b/src/main/scala/li/cil/oc/common/SaveHandler.scala
index 0fe41c1da..849fad215 100644
--- a/src/main/scala/li/cil/oc/common/SaveHandler.scala
+++ b/src/main/scala/li/cil/oc/common/SaveHandler.scala
@@ -195,11 +195,13 @@ object SaveHandler {
 
   @SubscribeEvent(priority = EventPriority.HIGHEST)
   def onWorldLoad(e: WorldEvent.Load) {
-    // Touch all externally saved data when loading, to avoid it getting
-    // deleted in the next save (because the now - save time will usually
-    // be larger than the time out after loading a world again).
-    if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)) SaveHandlerJava17Functionality.visitJava17(statePath)
-    else visitJava16()
+    if (!e.world.isRemote) {
+      // Touch all externally saved data when loading, to avoid it getting
+      // deleted in the next save (because the now - save time will usually
+      // be larger than the time out after loading a world again).
+      if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)) SaveHandlerJava17Functionality.visitJava17(statePath)
+      else visitJava16()
+    }
   }
 
   private def visitJava16() {