Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 19:46:21 +01:00
Code Issues Projects Releases Wiki Activity

Okay, back to arbitrary offsets!

Browse Source
This commit is contained in:
Dinnerbone 2011-07-07 20:29:57 +01:00
parent 2564043882
commit 0993e6cbd1
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/minecraft/server/WorldMap.java
View File

@ -37,15 +37,17 @@ public class WorldMap extends WorldMapBase {
// CraftBukkit start // CraftBukkit start
byte dimension = nbttagcompound.c("dimension"); byte dimension = nbttagcompound.c("dimension");
this.worldUID = nbttagcompound.getLong("WorldUID"); if (dimension >= 10) {
CraftWorld world = (CraftWorld) server.getWorld(this.worldUID); this.worldUID = nbttagcompound.getLong("WorldUID");
// Check if the stored world details are correct. CraftWorld world = (CraftWorld) server.getWorld(this.worldUID);
if (world == null) { // Check if the stored world details are correct.
/* All Maps which do not have their valid world loaded are set to a dimension which hopefully won't be reached. if (world == null) {
This is to prevent them being corrupted with the wrong map data. */ /* All Maps which do not have their valid world loaded are set to a dimension which hopefully won't be reached.
dimension = 127; This is to prevent them being corrupted with the wrong map data. */
} else { dimension = 127;
dimension = (byte) world.getHandle().dimension; } else {
dimension = (byte) world.getHandle().dimension;
}
} }
this.map = dimension; this.map = dimension;

2
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -393,7 +393,7 @@ public final class CraftServer implements Server {
converter.convert(name, new ConvertProgressUpdater(console)); converter.convert(name, new ConvertProgressUpdater(console));
} }
int dimension = Environment.values().length + 1 + console.worlds.size(); int dimension = 10 + console.worlds.size();
WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, dimension, seed, environment, generator); WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, dimension, seed, environment, generator);
internal.worldMaps = console.worlds.get(0).worldMaps; internal.worldMaps = console.worlds.get(0).worldMaps;