From 3650097544b3a061bcc9d7f978abaa4c7c722d35 Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee>
Date: Tue, 8 Jul 2014 09:08:02 +1000
Subject: [PATCH] Add More Information to session.lock Errors

---
 ...e-Information-to-session.lock-Errors.patch | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 CraftBukkit-Patches/0156-Add-More-Information-to-session.lock-Errors.patch

diff --git a/CraftBukkit-Patches/0156-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0156-Add-More-Information-to-session.lock-Errors.patch
new file mode 100644
index 00000000..8260c93c
--- /dev/null
+++ b/CraftBukkit-Patches/0156-Add-More-Information-to-session.lock-Errors.patch
@@ -0,0 +1,38 @@
+From 8f611b6bcc15ee4a2f00f2bdc535ee84af93ff13 Mon Sep 17 00:00:00 2001
+From: Suddenly <suddenly@suddenly.coffee>
+Date: Sat, 5 Jul 2014 16:56:44 +0100
+Subject: [PATCH] Add More Information to session.lock Errors
+
+
+diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
+index efdcad7..141248e 100644
+--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
++++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
+@@ -54,7 +54,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
+             }
+         } catch (IOException ioexception) {
+             ioexception.printStackTrace();
+-            throw new RuntimeException("Failed to check session lock, aborting");
++            throw new RuntimeException("Failed to check session lock for world located at " + this.baseDir + ", aborting. Stop the server and delete the session.lock in this world to prevent further issues."); // Spigot
+         }
+     }
+ 
+@@ -69,13 +69,13 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
+ 
+             try {
+                 if (datainputstream.readLong() != this.sessionId) {
+-                    throw new ExceptionWorldConflict("The save is being accessed from another location, aborting");
++                    throw new ExceptionWorldConflict("The save for world located at " + this.baseDir + " is being accessed from another location, aborting");  // Spigot
+                 }
+             } finally {
+                 datainputstream.close();
+             }
+         } catch (IOException ioexception) {
+-            throw new ExceptionWorldConflict("Failed to check session lock, aborting");
++            throw new ExceptionWorldConflict("Failed to check session lock for world located at " + this.baseDir + ", aborting. Stop the server and delete the session.lock in this world to prevent further issues."); // Spigot
+         }
+     }
+ 
+-- 
+1.9.1
+