twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 19:55:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update CraftBukkit to 1.6.1

Browse Source
This commit is contained in:
Nate Mortensen
2013-07-01 06:03:00 -05:00
committed by Wesley Wolfe
parent f887b76a25
commit 6c09066e22
228 changed files with 6426 additions and 5442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/main/java/net/minecraft/server/DedicatedServer.java
View File

@@ -19,21 +19,21 @@ import org.bukkit.event.server.ServerCommandEvent;
public class DedicatedServer extends MinecraftServer implements IMinecraftServer {
private final List k = Collections.synchronizedList(new ArrayList());
private final IConsoleLogManager l;
private RemoteStatusListener m;
private RemoteControlListener n;
private final List l = Collections.synchronizedList(new ArrayList());
private final IConsoleLogManager m;
private RemoteStatusListener n;
private RemoteControlListener o;
public PropertyManager propertyManager; // CraftBukkit - private -> public
private boolean generateStructures;
private EnumGamemode q;
private ServerConnection r;
private boolean s = false;
private EnumGamemode r;
private ServerConnection s;
private boolean t;
// CraftBukkit start - Signature changed
public DedicatedServer(joptsimple.OptionSet options) {
super(options);
// CraftBukkit end
this.l = new ConsoleLogManager("Minecraft-Server", (String) null, (String) null); // CraftBukkit - null last argument
this.m = new ConsoleLogManager("Minecraft-Server", (String) null, (String) null); // CraftBukkit - null last argument
new ThreadSleepForever(this);
}
@@ -48,18 +48,18 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
System.setErr(new PrintStream(new LoggerOutputStream(this.getLogger().getLogger(), Level.SEVERE), true));
// CraftBukkit end
this.getLogger().info("Starting minecraft server version 1.5.2");
this.getLogger().info("Starting minecraft server version 1.6.1");
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
this.getLogger().warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
}
this.getLogger().info("Loading properties");
this.propertyManager = new PropertyManager(this.options, this.getLogger()); // CraftBukkit - CLI argument support
if (this.I()) {
this.d("127.0.0.1");
if (this.K()) {
this.c("127.0.0.1");
} else {
this.setOnlineMode(this.propertyManager.getBoolean("online-mode", true));
this.d(this.propertyManager.getString("server-ip", ""));
this.c(this.propertyManager.getString("server-ip", ""));
}
this.setSpawnAnimals(this.propertyManager.getBoolean("spawn-animals", true));
@@ -78,24 +78,24 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
this.generateStructures = this.propertyManager.getBoolean("generate-structures", true);
int i = this.propertyManager.getInt("gamemode", EnumGamemode.SURVIVAL.a());
this.q = WorldSettings.a(i);
this.getLogger().info("Default game type: " + this.q);
this.r = WorldSettings.a(i);
this.getLogger().info("Default game type: " + this.r);
InetAddress inetaddress = null;
if (this.getServerIp().length() > 0) {
inetaddress = InetAddress.getByName(this.getServerIp());
}
if (this.G() < 0) {
if (this.I() < 0) {
this.setPort(this.propertyManager.getInt("server-port", 25565));
}
this.getLogger().info("Generating keypair");
this.a(MinecraftEncryption.b());
this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.G());
this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.I());
try {
this.r = new DedicatedServerConnection(this, inetaddress, this.G());
this.s = new DedicatedServerConnection(this, inetaddress, this.I());
} catch (Throwable ioexception) { // CraftBukkit - IOException -> Throwable
this.getLogger().warning("**** FAILED TO BIND TO PORT!");
this.getLogger().warning("The exception was: {0}", new Object[] { ioexception.toString()});
@@ -116,8 +116,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
this.convertable = new WorldLoaderServer(server.getWorldContainer()); // CraftBukkit - moved from MinecraftServer constructor
long j = System.nanoTime();
if (this.J() == null) {
this.l(this.propertyManager.getString("level-name", "world"));
if (this.L() == null) {
this.k(this.propertyManager.getString("level-name", "world"));
}
String s = this.propertyManager.getString("level-seed", "");
@@ -147,22 +147,22 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
this.d((this.getMaxBuildHeight() + 8) / 16 * 16);
this.d(MathHelper.a(this.getMaxBuildHeight(), 64, 256));
this.propertyManager.a("max-build-height", Integer.valueOf(this.getMaxBuildHeight()));
this.getLogger().info("Preparing level \"" + this.J() + "\"");
this.a(this.J(), this.J(), k, worldtype, s2);
this.getLogger().info("Preparing level \"" + this.L() + "\"");
this.a(this.L(), this.L(), k, worldtype, s2);
long i1 = System.nanoTime() - j;
String s3 = String.format("%.3fs", new Object[] { Double.valueOf((double) i1 / 1.0E9D)});
this.getLogger().info("Done (" + s3 + ")! For help, type \"help\" or \"?\"");
if (this.propertyManager.getBoolean("enable-query", false)) {
this.getLogger().info("Starting GS4 status listener");
this.m = new RemoteStatusListener(this);
this.m.a();
this.n = new RemoteStatusListener(this);
this.n.a();
}
if (this.propertyManager.getBoolean("enable-rcon", false)) {
this.getLogger().info("Starting remote control listener");
this.n = new RemoteControlListener(this);
this.n.a();
this.o = new RemoteControlListener(this);
this.o.a();
this.remoteConsole = new org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender(); // CraftBukkit
}
@@ -188,7 +188,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public EnumGamemode getGamemode() {
return this.q;
return this.r;
}
public int getDifficulty() {
@@ -201,7 +201,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
protected void a(CrashReport crashreport) {
while (this.isRunning()) {
this.an();
this.ar();
try {
Thread.sleep(10L);
@@ -218,13 +218,13 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return crashreport;
}
protected void p() {
protected void r() {
System.exit(0);
}
public void r() { // CraftBukkit - protected -> public
super.r();
this.an();
public void t() { // CraftBukkit - protected -> public
super.t();
this.ar();
}
public boolean getAllowNether() {
@@ -236,8 +236,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public void a(MojangStatisticsGenerator mojangstatisticsgenerator) {
mojangstatisticsgenerator.a("whitelist_enabled", Boolean.valueOf(this.ao().getHasWhitelist()));
mojangstatisticsgenerator.a("whitelist_count", Integer.valueOf(this.ao().getWhitelisted().size()));
mojangstatisticsgenerator.a("whitelist_enabled", Boolean.valueOf(this.as().getHasWhitelist()));
mojangstatisticsgenerator.a("whitelist_count", Integer.valueOf(this.as().getWhitelisted().size()));
super.a(mojangstatisticsgenerator);
}
@@ -246,12 +246,12 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public void issueCommand(String s, ICommandListener icommandlistener) {
this.k.add(new ServerCommand(s, icommandlistener));
this.l.add(new ServerCommand(s, icommandlistener));
}
public void an() {
while (!this.k.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.k.remove(0);
public void ar() {
while (!this.l.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.l.remove(0);
// CraftBukkit start - ServerCommand for preprocessing
ServerCommandEvent event = new ServerCommandEvent(this.console, servercommand.command);
@@ -264,16 +264,16 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
}
public boolean T() {
public boolean V() {
return true;
}
public DedicatedPlayerList ao() {
public DedicatedPlayerList as() {
return (DedicatedPlayerList) super.getPlayerList();
}
public ServerConnection ae() {
return this.r;
public ServerConnection ag() {
return this.s;
}
public int a(String s, int i) {
@@ -302,13 +302,13 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return file1 != null ? file1.getAbsolutePath() : "No settings file";
}
public void ap() {
public void at() {
ServerGUI.a(this);
this.s = true;
this.t = true;
}
public boolean ag() {
return this.s;
public boolean ai() {
return this.t;
}
public String a(EnumGamemode enumgamemode, boolean flag) {
@@ -326,9 +326,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
public boolean a(World world, int i, int j, int k, EntityHuman entityhuman) {
if (world.worldProvider.dimension != 0) {
return false;
} else if (this.ao().getOPs().isEmpty()) {
} else if (this.as().getOPs().isEmpty()) {
return false;
} else if (this.ao().isOp(entityhuman.name)) {
} else if (this.as().isOp(entityhuman.getName())) {
return false;
} else if (this.getSpawnProtection() <= 0) {
return false;
@@ -343,10 +343,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public IConsoleLogManager getLogger() {
return this.l;
return this.m;
}
public int k() {
return this.propertyManager.getInt("op-permission-level", 4);
}
public PlayerList getPlayerList() {
return this.ao();
return this.as();
}
}