OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 04:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the accounting for world UID conflicts.

Browse source
This commit is contained in:
EvilSeph 2011-07-13 15:35:05 -04:00
parent 3d28c67c08
commit 185d590146
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -401,9 +401,7 @@ public final class CraftServer implements Server {
int dimension = 10 + 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);
if (getWorld(internal.getUUID()) != null) { if (!(worlds.containsKey(name.toLowerCase()))) {
worlds.remove(name);
System.out.println("World " + name + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + name + "'s world directory if you want to be able to load the duplicate world.");
return null; return null;
} }
@ -512,6 +510,11 @@ public final class CraftServer implements Server {
} }
public void addWorld(World world) { public void addWorld(World world) {
// Check if a World already exists with the UID.
if (getWorld(world.getUID()) != null) {
System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
return;
}
worlds.put(world.getName().toLowerCase(), world); worlds.put(world.getName().toLowerCase(), world);
} }