2015-03-11 11:44:51 +01:00
--- /home/matt/mc-dev-private//net/minecraft/server/MinecraftServer.java 2015-03-11 10:44:42.911576345 +0000
+++ src/main/java/net/minecraft/server/MinecraftServer.java 2015-03-11 10:44:42.915576345 +0000
2015-02-26 23:41:06 +01:00
@@ -38,14 +38,27 @@
2014-11-25 22:32:16 +01:00
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+// CraftBukkit start
+import java.io.IOException;
+
+import jline.console.ConsoleReader;
+import joptsimple.OptionSet;
+
+import org.bukkit.craftbukkit.Main;
+import org.bukkit.World.Environment;
+import org.bukkit.craftbukkit.util.Waitable;
+import org.bukkit.event.server.RemoteServerCommandEvent;
+import org.bukkit.event.world.WorldSaveEvent;
+// CraftBukkit end
2015-02-26 23:41:06 +01:00
+
public abstract class MinecraftServer implements Runnable, ICommandListener, IAsyncTaskHandler, IMojangStatistics {
- private static final Logger LOGGER = LogManager.getLogger();
+ public static final Logger LOGGER = LogManager.getLogger();
public static final File a = new File("usercache.json");
private static MinecraftServer l;
- private final Convertable convertable;
+ public Convertable convertable; // CraftBukkit - remove final, public
private final MojangStatisticsGenerator n = new MojangStatisticsGenerator("server", this, ay());
- private final File universe;
+ public File universe; // CraftBukkit - remove final, public
private final List<IUpdatePlayerListBox> p = Lists.newArrayList();
protected final ICommandHandler b;
public final MethodProfiler methodProfiler = new MethodProfiler();
@@ -94,19 +107,61 @@
2014-11-25 22:32:16 +01:00
private Thread serverThread;
2015-02-26 23:41:06 +01:00
private long ab = ay();
2014-11-25 22:32:16 +01:00
- public MinecraftServer(File file, Proxy proxy, File file1) {
+ // CraftBukkit start
+ public List<WorldServer> worlds = new ArrayList<WorldServer>();
+ public org.bukkit.craftbukkit.CraftServer server;
+ public OptionSet options;
+ public org.bukkit.command.ConsoleCommandSender console;
+ public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
+ public ConsoleReader reader;
+ public static int currentTick = (int) (System.currentTimeMillis() / 50);
+ public final Thread primaryThread;
+ public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
+ public int autosavePeriod;
+ // CraftBukkit end
+
+ public MinecraftServer(OptionSet options, Proxy proxy, File file1) {
2015-02-26 23:41:06 +01:00
this.e = proxy;
MinecraftServer.l = this;
2014-11-25 22:32:16 +01:00
- this.universe = file;
+ // this.universe = file; // CraftBukkit
this.q = new ServerConnection(this);
this.Z = new UserCache(this, file1);
2015-02-26 23:41:06 +01:00
this.b = this.h();
2014-11-25 22:32:16 +01:00
- this.convertable = new WorldLoaderServer(file);
+ // this.convertable = new WorldLoaderServer(file); // CraftBukkit - moved to DedicatedServer.init
this.V = new YggdrasilAuthenticationService(proxy, UUID.randomUUID().toString());
this.W = this.V.createMinecraftSessionService();
this.Y = this.V.createProfileRepository();
+ // CraftBukkit start
+ this.options = options;
+ // Try to see if we're actually running in a terminal, disable jline if not
+ if (System.console() == null) {
+ System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
+ Main.useJline = false;
+ }
+
+ try {
+ reader = new ConsoleReader(System.in, System.out);
+ reader.setExpandEvents(false); // Avoid parsing exceptions for uncommonly used event designators
+ } catch (Throwable e) {
+ try {
+ // Try again with jline disabled for Windows users without C++ 2008 Redistributable
+ System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
+ System.setProperty("user.language", "en");
+ Main.useJline = false;
+ reader = new ConsoleReader(System.in, System.out);
+ reader.setExpandEvents(false);
+ } catch (IOException ex) {
+ LOGGER.warn((String) null, ex);
+ }
+ }
+ Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
+
+ this.serverThread = primaryThread = new Thread(this, "Server thread"); // Moved from main
}
+ public abstract PropertyManager getPropertyManager();
+ // CraftBukkit end
+
protected CommandDispatcher h() {
return new CommandDispatcher();
}
2015-02-26 23:41:06 +01:00
@@ -144,6 +199,7 @@
2014-11-25 22:32:16 +01:00
this.a(s);
this.b("menu.loadingLevel");
this.worldServer = new WorldServer[3];
+ /* CraftBukkit start - Remove ticktime arrays and worldsettings
2015-02-26 23:41:06 +01:00
this.i = new long[this.worldServer.length][100];
2014-11-25 22:32:16 +01:00
IDataManager idatamanager = this.convertable.a(s, true);
2015-03-08 11:08:19 +01:00
@@ -167,37 +223,108 @@
2014-11-25 22:32:16 +01:00
worlddata.a(s1);
worldsettings = new WorldSettings(worlddata);
}
+ */
+ int worldCount = 3;
- for (int j = 0; j < this.worldServer.length; ++j) {
- byte b0 = 0;
+ for (int j = 0; j < worldCount; ++j) {
+ WorldServer world;
+ byte dimension = 0;
if (j == 1) {
- b0 = -1;
+ if (getAllowNether()) {
+ dimension = -1;
+ } else {
+ continue;
+ }
}
if (j == 2) {
- b0 = 1;
+ if (server.getAllowEnd()) {
+ dimension = 1;
+ } else {
+ continue;
+ }
}
+ String worldType = org.bukkit.World.Environment.getEnvironment(dimension).toString().toLowerCase();
+ String name = (dimension == 0) ? s : s + "_" + worldType;
+
+ org.bukkit.generator.ChunkGenerator gen = this.server.getGenerator(name);
+ WorldSettings worldsettings = new WorldSettings(i, this.getGamemode(), this.getGenerateStructures(), this.isHardcore(), worldtype);
+ worldsettings.setGeneratorSettings(s2);
+
if (j == 0) {
+ IDataManager idatamanager = new ServerNBTManager(server.getWorldContainer(), s1, true);
+ WorldData worlddata = idatamanager.getWorldData();
+ if (worlddata == null) {
+ worlddata = new WorldData(worldsettings, s1);
+ }
2014-11-29 20:33:33 +01:00
+ worlddata.checkName(s1); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
2014-11-25 22:32:16 +01:00
if (this.W()) {
- this.worldServer[j] = (WorldServer) (new DemoWorldServer(this, idatamanager, worlddata, b0, this.methodProfiler)).b();
+ world = (WorldServer) (new DemoWorldServer(this, idatamanager, worlddata, dimension, this.methodProfiler)).b();
} else {
- this.worldServer[j] = (WorldServer) (new WorldServer(this, idatamanager, worlddata, b0, this.methodProfiler)).b();
+ world = (WorldServer) (new WorldServer(this, idatamanager, worlddata, dimension, this.methodProfiler, org.bukkit.World.Environment.getEnvironment(dimension), gen)).b();
}
- this.worldServer[j].a(worldsettings);
+ world.a(worldsettings);
+ this.server.scoreboardManager = new org.bukkit.craftbukkit.scoreboard.CraftScoreboardManager(this, world.getScoreboard());
} else {
- this.worldServer[j] = (WorldServer) (new SecondaryWorldServer(this, idatamanager, b0, this.worldServer[0], this.methodProfiler)).b();
+ String dim = "DIM" + dimension;
+
+ File newWorld = new File(new File(name), dim);
+ File oldWorld = new File(new File(s), dim);
+
+ if ((!newWorld.isDirectory()) && (oldWorld.isDirectory())) {
+ MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder required ----");
+ MinecraftServer.LOGGER.info("Unfortunately due to the way that Minecraft implemented multiworld support in 1.6, Bukkit requires that you move your " + worldType + " folder to a new location in order to operate correctly.");
+ MinecraftServer.LOGGER.info("We will move this folder for you, but it will mean that you need to move it back should you wish to stop using Bukkit in the future.");
+ MinecraftServer.LOGGER.info("Attempting to move " + oldWorld + " to " + newWorld + "...");
+
+ if (newWorld.exists()) {
+ MinecraftServer.LOGGER.warn("A file or folder already exists at " + newWorld + "!");
+ MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder failed ----");
+ } else if (newWorld.getParentFile().mkdirs()) {
+ if (oldWorld.renameTo(newWorld)) {
+ MinecraftServer.LOGGER.info("Success! To restore " + worldType + " in the future, simply move " + newWorld + " to " + oldWorld);
+ // Migrate world data too.
+ try {
+ com.google.common.io.Files.copy(new File(new File(s), "level.dat"), new File(new File(name), "level.dat"));
+ } catch (IOException exception) {
+ MinecraftServer.LOGGER.warn("Unable to migrate world data.");
+ }
+ MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder complete ----");
+ } else {
+ MinecraftServer.LOGGER.warn("Could not move folder " + oldWorld + " to " + newWorld + "!");
+ MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder failed ----");
+ }
+ } else {
+ MinecraftServer.LOGGER.warn("Could not create path for " + newWorld + "!");
+ MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder failed ----");
+ }
+ }
+
+ IDataManager idatamanager = new ServerNBTManager(server.getWorldContainer(), name, true);
+ // world =, b0 to dimension, s1 to name, added Environment and gen
+ WorldData worlddata = idatamanager.getWorldData();
+ if (worlddata == null) {
+ worlddata = new WorldData(worldsettings, name);
+ }
2014-11-29 20:33:33 +01:00
+ worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
2014-11-25 22:32:16 +01:00
+ world = (WorldServer) new SecondaryWorldServer(this, idatamanager, dimension, this.worlds.get(0), this.methodProfiler, worlddata, org.bukkit.World.Environment.getEnvironment(dimension), gen).b();
}
- this.worldServer[j].addIWorldAccess(new WorldManager(this, this.worldServer[j]));
+ this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldInitEvent(world.getWorld()));
+
+ world.addIWorldAccess(new WorldManager(this, world));
if (!this.S()) {
- this.worldServer[j].getWorldData().setGameType(this.getGamemode());
+ world.getWorldData().setGameType(this.getGamemode());
}
+
+ worlds.add(world);
+ getPlayerList().setPlayerFileData(worlds.toArray(new WorldServer[worlds.size()]));
}
- this.v.setPlayerFileData(this.worldServer);
+ // CraftBukkit end
this.a(this.getDifficulty());
this.k();
}
2015-03-08 11:08:19 +01:00
@@ -212,25 +339,38 @@
2014-11-25 22:32:16 +01:00
this.b("menu.generatingTerrain");
byte b0 = 0;
- MinecraftServer.LOGGER.info("Preparing start region for level " + b0);
- WorldServer worldserver = this.worldServer[b0];
- BlockPosition blockposition = worldserver.getSpawn();
2015-02-26 23:41:06 +01:00
- long j = ay();
2014-11-25 22:32:16 +01:00
-
- for (int k = -192; k <= 192 && this.isRunning(); k += 16) {
- for (int l = -192; l <= 192 && this.isRunning(); l += 16) {
2015-02-26 23:41:06 +01:00
- long i1 = ay();
2014-11-25 22:32:16 +01:00
-
- if (i1 - j > 1000L) {
- this.a_("Preparing spawn area", i * 100 / 625);
- j = i1;
- }
+ // CraftBukkit start - fire WorldLoadEvent and handle whether or not to keep the spawn in memory
+ for (int m = 0; m < worlds.size(); m++) {
+ WorldServer worldserver = this.worlds.get(m);
+ LOGGER.info("Preparing start region for level " + m + " (Seed: " + worldserver.getSeed() + ")");
+
+ if (!worldserver.getWorld().getKeepSpawnInMemory()) {
+ continue;
+ }
+
+ BlockPosition blockposition = worldserver.getSpawn();
2015-02-26 23:41:06 +01:00
+ long j = ay();
2014-11-25 22:32:16 +01:00
+ i = 0;
+
+ for (int k = -192; k <= 192 && this.isRunning(); k += 16) {
+ for (int l = -192; l <= 192 && this.isRunning(); l += 16) {
2015-02-26 23:41:06 +01:00
+ long i1 = ay();
2014-11-25 22:32:16 +01:00
+
+ if (i1 - j > 1000L) {
+ this.a_("Preparing spawn area", i * 100 / 625);
+ j = i1;
+ }
- ++i;
- worldserver.chunkProviderServer.getChunkAt(blockposition.getX() + k >> 4, blockposition.getZ() + l >> 4);
+ ++i;
+ worldserver.chunkProviderServer.getChunkAt(blockposition.getX() + k >> 4, blockposition.getZ() + l >> 4);
+ }
}
}
+ for (WorldServer world : this.worlds) {
+ this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(world.getWorld()));
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
this.r();
2014-11-25 22:32:16 +01:00
}
2015-03-08 11:08:19 +01:00
@@ -264,35 +404,52 @@
2015-02-26 23:41:06 +01:00
protected void r() {
this.f = null;
this.g = 0;
2014-11-25 22:32:16 +01:00
+
+ this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD); // CraftBukkit
}
- protected void saveChunks(boolean flag) {
+ protected void saveChunks(boolean flag) throws ExceptionWorldConflict { // CraftBukkit - added throws
if (!this.N) {
2015-02-26 23:41:06 +01:00
WorldServer[] aworldserver = this.worldServer;
int i = aworldserver.length;
2014-11-25 22:32:16 +01:00
- for (int j = 0; j < i; ++j) {
- WorldServer worldserver = aworldserver[j];
+ // CraftBukkit start
+ for (int j = 0; j < worlds.size(); ++j) {
+ WorldServer worldserver = worlds.get(j);
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
2014-11-25 22:32:16 +01:00
if (worldserver != null) {
if (!flag) {
MinecraftServer.LOGGER.info("Saving chunks for level \'" + worldserver.getWorldData().getName() + "\'/" + worldserver.worldProvider.getName());
}
- try {
- worldserver.save(true, (IProgressUpdate) null);
- } catch (ExceptionWorldConflict exceptionworldconflict) {
- MinecraftServer.LOGGER.warn(exceptionworldconflict.getMessage());
- }
+ worldserver.save(true, (IProgressUpdate) null);
+ worldserver.saveLevel();
}
}
}
}
2015-02-26 23:41:06 +01:00
- protected void stop() {
2015-02-07 11:39:00 +01:00
+ // CraftBukkit start
+ private boolean hasStopped = false;
+ private final Object stopLock = new Object();
+ // CraftBukkit end
+
2014-11-25 22:32:16 +01:00
+ public void stop() throws ExceptionWorldConflict { // CraftBukkit - added throws
2015-02-07 11:39:00 +01:00
+ // CraftBukkit start - prevent double stopping on multiple threads
+ synchronized(stopLock) {
+ if (hasStopped) return;
+ hasStopped = true;
+ }
+ // CraftBukkit end
2014-11-25 22:32:16 +01:00
if (!this.N) {
MinecraftServer.LOGGER.info("Stopping server");
+ // CraftBukkit start
+ if (this.server != null) {
+ this.server.disablePlugins();
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
if (this.ap() != null) {
this.ap().b();
2014-11-25 22:32:16 +01:00
}
2015-03-08 11:08:19 +01:00
@@ -307,11 +464,13 @@
2014-11-25 22:32:16 +01:00
MinecraftServer.LOGGER.info("Saving worlds");
this.saveChunks(false);
+ /* CraftBukkit start - Handled in saveChunks
for (int i = 0; i < this.worldServer.length; ++i) {
WorldServer worldserver = this.worldServer[i];
worldserver.saveLevel();
}
+ // CraftBukkit end */
}
2015-02-26 23:41:06 +01:00
if (this.n.d()) {
2015-03-08 11:08:19 +01:00
@@ -352,6 +511,7 @@
2014-11-25 22:32:16 +01:00
long k = j - this.ab;
if (k > 2000L && this.ab - this.R >= 15000L) {
+ if (server.getWarnOnOverload()) // CraftBukkit
MinecraftServer.LOGGER.warn("Can\'t keep up! Did the system time change, or is the server overloaded? Running {}ms behind, skipping {} tick(s)", new Object[] { Long.valueOf(k), Long.valueOf(k / 50L)});
k = 2000L;
this.R = this.ab;
2015-03-08 11:08:19 +01:00
@@ -364,11 +524,12 @@
2014-11-25 22:32:16 +01:00
i += k;
this.ab = j;
- if (this.worldServer[0].everyoneDeeplySleeping()) {
2015-02-26 23:41:06 +01:00
+ if (this.worlds.get(0).everyoneDeeplySleeping()) {
this.z();
2014-11-25 22:32:16 +01:00
i = 0L;
} else {
while (i > 50L) {
+ MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit
i -= 50L;
2015-02-26 23:41:06 +01:00
this.z();
2014-11-25 22:32:16 +01:00
}
2015-03-08 11:08:19 +01:00
@@ -406,6 +567,12 @@
2014-11-25 22:32:16 +01:00
} catch (Throwable throwable1) {
MinecraftServer.LOGGER.error("Exception stopping the server", throwable1);
} finally {
+ // CraftBukkit start - Restore terminal to original settings
+ try {
+ reader.getTerminal().restore();
+ } catch (Exception ignored) {
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
this.y();
2014-11-25 22:32:16 +01:00
}
2015-03-08 11:08:19 +01:00
@@ -445,7 +612,7 @@
2014-11-25 22:32:16 +01:00
2015-02-26 23:41:06 +01:00
protected void y() {}
2014-11-25 22:32:16 +01:00
2015-02-26 23:41:06 +01:00
- protected void z() {
+ protected void z() throws ExceptionWorldConflict { // CraftBukkit - added throws
2014-11-25 22:32:16 +01:00
long i = System.nanoTime();
++this.ticks;
2015-03-08 11:08:19 +01:00
@@ -471,7 +638,7 @@
2014-11-25 22:32:16 +01:00
this.r.b().a(agameprofile);
}
- if (this.ticks % 900 == 0) {
+ if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
this.methodProfiler.a("save");
this.v.savePlayers();
this.saveChunks(true);
2015-03-08 11:08:19 +01:00
@@ -506,20 +673,40 @@
2014-11-25 22:32:16 +01:00
this.methodProfiler.c("levels");
+ // CraftBukkit start
+ this.server.getScheduler().mainThreadHeartbeat(this.ticks);
+
+ // Run tasks that are waiting on processing
+ while (!processQueue.isEmpty()) {
+ processQueue.remove().run();
+ }
+
+ org.bukkit.craftbukkit.chunkio.ChunkIOExecutor.tick();
+
+ // Send time updates to everyone, it will get the right time from the world the player is in.
+ if (this.ticks % 20 == 0) {
+ for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
+ EntityPlayer entityplayer = (EntityPlayer) this.getPlayerList().players.get(i);
+ entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time
+ }
+ }
+
int i;
- for (i = 0; i < this.worldServer.length; ++i) {
+ for (i = 0; i < this.worlds.size(); ++i) {
long j = System.nanoTime();
- if (i == 0 || this.getAllowNether()) {
- WorldServer worldserver = this.worldServer[i];
+ // if (i == 0 || this.getAllowNether()) {
+ WorldServer worldserver = this.worlds.get(i);
this.methodProfiler.a(worldserver.getWorldData().getName());
+ /* Drop global time updates
if (this.ticks % 20 == 0) {
this.methodProfiler.a("timeSync");
this.v.a(new PacketPlayOutUpdateTime(worldserver.getTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean("doDaylightCycle")), worldserver.worldProvider.getDimension());
this.methodProfiler.b();
}
+ // CraftBukkit end */
this.methodProfiler.a("tick");
2015-03-08 11:08:19 +01:00
@@ -546,9 +733,9 @@
2014-11-25 22:32:16 +01:00
worldserver.getTracker().updatePlayers();
this.methodProfiler.b();
this.methodProfiler.b();
- }
+ // } // CraftBukkit
2015-02-26 23:41:06 +01:00
- this.i[i][this.ticks % 100] = System.nanoTime() - j;
+ // this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit
2014-11-25 22:32:16 +01:00
}
this.methodProfiler.c("connection");
2015-03-08 11:08:19 +01:00
@@ -572,10 +759,11 @@
2015-02-26 23:41:06 +01:00
this.p.add(iupdateplayerlistbox);
2014-11-25 22:32:16 +01:00
}
- public static void main(String[] astring) {
+ public static void main(final OptionSet options) { // CraftBukkit - replaces main(String[] astring)
DispenserRegistry.c();
try {
+ /* CraftBukkit start - Replace everything
boolean flag = true;
String s = null;
String s1 = ".";
2015-03-08 11:08:19 +01:00
@@ -653,6 +841,27 @@
2015-02-26 23:41:06 +01:00
dedicatedserver.stop();
}
});
2014-11-25 22:32:16 +01:00
+ */
+
+ DedicatedServer dedicatedserver = new DedicatedServer(options);
+
+ if (options.has("port")) {
+ int port = (Integer) options.valueOf("port");
+ if (port > 0) {
+ dedicatedserver.setPort(port);
+ }
+ }
+
+ if (options.has("universe")) {
+ dedicatedserver.universe = (File) options.valueOf("universe");
+ }
+
+ if (options.has("world")) {
+ dedicatedserver.setWorld((String) options.valueOf("world"));
+ }
+
+ dedicatedserver.primaryThread.start();
+ // CraftBukkit end
} catch (Exception exception) {
MinecraftServer.LOGGER.fatal("Failed to start the minecraft server", exception);
}
2015-03-08 11:08:19 +01:00
@@ -660,8 +869,10 @@
2014-11-25 22:32:16 +01:00
}
2015-02-26 23:41:06 +01:00
public void C() {
2014-11-25 22:32:16 +01:00
+ /* CraftBukkit start - prevent abuse
this.serverThread = new Thread(this, "Server thread");
this.serverThread.start();
+ // CraftBukkit end */
}
public File d(String s) {
2015-03-08 11:08:19 +01:00
@@ -677,7 +888,14 @@
2014-11-25 22:32:16 +01:00
}
public WorldServer getWorldServer(int i) {
- return i == -1 ? this.worldServer[1] : (i == 1 ? this.worldServer[2] : this.worldServer[0]);
+ // CraftBukkit start
+ for (WorldServer world : worlds) {
+ if (world.dimension == i) {
+ return world;
+ }
+ }
+ return worlds.get(0);
+ // CraftBukkit end
}
2015-02-26 23:41:06 +01:00
public String D() {
2015-03-08 11:08:19 +01:00
@@ -713,7 +931,7 @@
2014-11-25 22:32:16 +01:00
}
public boolean isDebugging() {
- return false;
+ return this.getPropertyManager().getBoolean("debug", false); // CraftBukkit - don't hardcode
}
2015-02-26 23:41:06 +01:00
public void g(String s) {
2015-03-08 11:08:19 +01:00
@@ -728,7 +946,7 @@
2014-11-25 22:32:16 +01:00
}
public String getServerModName() {
- return "vanilla";
+ return server.getName(); // CraftBukkit - cb > vanilla!
}
public CrashReport b(CrashReport crashreport) {
2015-03-08 11:08:19 +01:00
@@ -757,6 +975,7 @@
2014-11-25 22:32:16 +01:00
}
2015-02-26 23:41:06 +01:00
public List<String> tabCompleteCommand(ICommandListener icommandlistener, String s, BlockPosition blockposition) {
2014-11-25 22:32:16 +01:00
+ /* CraftBukkit start - Allow tab-completion of Bukkit commands
ArrayList arraylist = Lists.newArrayList();
if (s.startsWith("/")) {
2015-03-08 11:08:19 +01:00
@@ -795,6 +1014,9 @@
2014-11-25 22:32:16 +01:00
return arraylist;
}
+ */
+ return server.tabComplete(icommandlistener, s);
+ // CraftBukkit end
}
public static MinecraftServer getServer() {
2015-03-08 11:08:19 +01:00
@@ -802,7 +1024,7 @@
2014-11-29 01:53:49 +01:00
}
public boolean N() {
- return this.universe != null;
+ return true; // CraftBukkit
}
public String getName() {
2015-03-08 11:08:19 +01:00
@@ -858,8 +1080,10 @@
2014-11-25 22:32:16 +01:00
}
public void a(EnumDifficulty enumdifficulty) {
- for (int i = 0; i < this.worldServer.length; ++i) {
- WorldServer worldserver = this.worldServer[i];
+ // CraftBukkit start
+ for (int i = 0; i < this.worlds.size(); ++i) {
+ WorldServer worldserver = this.worlds.get(i);
+ // CraftBukkit end
if (worldserver != null) {
if (worldserver.getWorldData().isHardcore()) {
2015-03-08 11:08:19 +01:00
@@ -901,15 +1125,17 @@
2014-11-25 22:32:16 +01:00
this.N = true;
this.getConvertable().d();
- for (int i = 0; i < this.worldServer.length; ++i) {
- WorldServer worldserver = this.worldServer[i];
2015-02-26 23:41:06 +01:00
-
2014-11-25 22:32:16 +01:00
+ // CraftBukkit start
+ for (int i = 0; i < this.worlds.size(); ++i) {
+ WorldServer worldserver = this.worlds.get(i);
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2014-11-25 22:32:16 +01:00
if (worldserver != null) {
worldserver.saveLevel();
}
}
- this.getConvertable().e(this.worldServer[0].getDataManager().g());
+ this.getConvertable().e(this.worlds.get(0).getDataManager().g()); // CraftBukkit
this.safeShutdown();
}
2015-03-08 11:08:19 +01:00
@@ -942,9 +1168,11 @@
2014-11-25 22:32:16 +01:00
int i = 0;
if (this.worldServer != null) {
- for (int j = 0; j < this.worldServer.length; ++j) {
- if (this.worldServer[j] != null) {
- WorldServer worldserver = this.worldServer[j];
+ // CraftBukkit start
+ for (int j = 0; j < this.worlds.size(); ++j) {
+ WorldServer worldserver = this.worlds.get(j);
+ if (worldserver != null) {
+ // CraftBukkit end
WorldData worlddata = worldserver.getWorldData();
mojangstatisticsgenerator.a("world[" + i + "][dimension]", Integer.valueOf(worldserver.worldProvider.getDimension()));
2015-03-08 11:08:19 +01:00
@@ -977,7 +1205,7 @@
2014-11-25 22:32:16 +01:00
public abstract boolean ad();
public boolean getOnlineMode() {
- return this.onlineMode;
+ return server.getOnlineMode(); // CraftBukkit
}
public void setOnlineMode(boolean flag) {
2015-03-08 11:08:19 +01:00
@@ -1049,8 +1277,9 @@
2014-11-25 22:32:16 +01:00
}
2015-02-26 23:41:06 +01:00
public void setGamemode(WorldSettings.EnumGamemode worldsettings_enumgamemode) {
2014-11-25 22:32:16 +01:00
- for (int i = 0; i < this.worldServer.length; ++i) {
2015-02-26 23:41:06 +01:00
- getServer().worldServer[i].getWorldData().setGameType(worldsettings_enumgamemode);
2014-11-25 22:32:16 +01:00
+ // CraftBukkit start
+ for (int i = 0; i < this.worlds.size(); ++i) {
2015-02-26 23:41:06 +01:00
+ getServer().worlds.get(i).getWorldData().setGameType(worldsettings_enumgamemode);
2014-11-25 22:32:16 +01:00
}
}
2015-03-08 11:08:19 +01:00
@@ -1082,7 +1311,7 @@
2014-11-25 22:32:16 +01:00
}
public World getWorld() {
- return this.worldServer[0];
+ return this.worlds.get(0); // CraftBukkit
}
public Entity f() {
2015-03-08 11:08:19 +01:00
@@ -1153,8 +1382,10 @@
2015-02-26 23:41:06 +01:00
WorldServer[] aworldserver = this.worldServer;
int i = aworldserver.length;
2014-11-25 22:32:16 +01:00
- for (int j = 0; j < i; ++j) {
- WorldServer worldserver = aworldserver[j];
+ // CraftBukkit start
+ for (int j = 0; j < worlds.size(); ++j) {
+ WorldServer worldserver = worlds.get(j);
+ // CraftBukkit end
if (worldserver != null) {
Entity entity = worldserver.getEntity(uuid);
2015-03-08 11:08:19 +01:00
@@ -1169,7 +1400,7 @@
2014-11-25 22:32:16 +01:00
}
public boolean getSendCommandFeedback() {
- return getServer().worldServer[0].getGameRules().getBoolean("sendCommandFeedback");
2015-02-26 23:41:06 +01:00
+ return getServer().worlds.get(0).getGameRules().getBoolean("sendCommandFeedback");
2014-11-25 22:32:16 +01:00
}
2015-02-26 23:41:06 +01:00
public void a(CommandObjectiveExecutor.EnumCommandResult commandobjectiveexecutor_enumcommandresult, int i) {}
2015-03-11 11:44:51 +01:00
@@ -1180,7 +1411,7 @@
public <V> ListenableFuture<V> a(Callable<V> callable) {
Validate.notNull(callable);
- if (!this.isMainThread() && !this.isStopped()) {
+ if (!this.isMainThread()) { // CraftBukkit && !this.isStopped()) {
ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callable);
Queue queue = this.j;
