19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
From 0c830ff1ed96046b3eeb471c8bc499dcd9be0e1b 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 ee79cbd..b187aed 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,14 +69,14 @@ 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
|
|
}
|
|
}
|
|
|
|
--
|
|
2.1.0
|
|
|