OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added internal MC support for multiple worlds

Browse source 
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot 2011-02-05 18:15:04 +00:00
parent 622ca3e68c
commit 7d933716df
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -11,6 +11,7 @@ import net.minecraft.server.EntityPlayer;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.PropertyManager; import net.minecraft.server.PropertyManager;
import net.minecraft.server.ServerConfigurationManager; import net.minecraft.server.ServerConfigurationManager;
import net.minecraft.server.WorldServer;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
@ -148,8 +149,13 @@ public final class CraftServer implements Server {
return pluginManager; return pluginManager;
} }
<<<<<<< HEAD
public BukkitScheduler getScheduler() { public BukkitScheduler getScheduler() {
return scheduler; return scheduler;
=======
public World[] getWorlds() {
return console.worlds.toArray(new World[0]);
>>>>>>> f045828... Added internal MC support for multiple worlds
} }
public World[] getWorlds() { public World[] getWorlds() {
@ -170,14 +176,16 @@ public final class CraftServer implements Server {
console.d = config; console.d = config;
boolean animals = config.a("spawn-monsters", console.m); boolean animals = config.a("spawn-monsters", console.m);
boolean monsters = config.a("spawn-monsters", console.e.k > 0); boolean monsters = config.a("spawn-monsters", console.worlds.get(0).k > 0);
console.l = config.a("online-mode", console.l); console.l = config.a("online-mode", console.l);
console.m = config.a("spawn-animals", console.m); console.m = config.a("spawn-animals", console.m);
console.n = config.a("pvp", console.n); console.n = config.a("pvp", console.n);
console.e.k = monsters ? 1 : 0; for (WorldServer world : console.worlds) {
console.e.a(monsters, animals); world.k = monsters ? 1 : 0;
world.a(monsters, animals);
}
pluginManager.clearPlugins(); pluginManager.clearPlugins();
commandMap.clearCommands(); commandMap.clearCommands();