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.4

Browse Source
This commit is contained in:
feildmaster
2013-09-19 13:25:08 -05:00
parent e20ef1f606
commit dcb9d6a5ef
92 changed files with 730 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ 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.6.2");
this.getLogger().info("Starting minecraft server version 1.6.4");
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\"");
}
@@ -69,6 +69,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
this.setTexturePack(this.propertyManager.getString("texture-pack", ""));
this.setMotd(this.propertyManager.getString("motd", "A Minecraft Server"));
this.setForceGamemode(this.propertyManager.getBoolean("force-gamemode", false));
this.e(this.propertyManager.getInt("player-idle-timeout", 0));
if (this.propertyManager.getInt("difficulty", 1) < 0) {
this.propertyManager.a("difficulty", Integer.valueOf(0));
} else if (this.propertyManager.getInt("difficulty", 1) > 3) {
@@ -201,7 +202,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
protected void a(CrashReport crashreport) {
while (this.isRunning()) {
this.ar();
this.as();
try {
Thread.sleep(10L);
@@ -224,7 +225,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
public void t() { // CraftBukkit - protected -> public
super.t();
this.ar();
this.as();
}
public boolean getAllowNether() {
@@ -236,8 +237,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public void a(MojangStatisticsGenerator mojangstatisticsgenerator) {
mojangstatisticsgenerator.a("whitelist_enabled", Boolean.valueOf(this.as().getHasWhitelist()));
mojangstatisticsgenerator.a("whitelist_count", Integer.valueOf(this.as().getWhitelisted().size()));
mojangstatisticsgenerator.a("whitelist_enabled", Boolean.valueOf(this.at().getHasWhitelist()));
mojangstatisticsgenerator.a("whitelist_count", Integer.valueOf(this.at().getWhitelisted().size()));
super.a(mojangstatisticsgenerator);
}
@@ -249,7 +250,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
this.l.add(new ServerCommand(s, icommandlistener));
}
public void ar() {
public void as() {
while (!this.l.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.l.remove(0);
@@ -268,7 +269,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return true;
}
public DedicatedPlayerList as() {
public DedicatedPlayerList at() {
return (DedicatedPlayerList) super.getPlayerList();
}
@@ -302,7 +303,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return file1 != null ? file1.getAbsolutePath() : "No settings file";
}
public void at() {
public void au() {
ServerGUI.a(this);
this.t = true;
}
@@ -326,9 +327,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.as().getOPs().isEmpty()) {
} else if (this.at().getOPs().isEmpty()) {
return false;
} else if (this.as().isOp(entityhuman.getName())) {
} else if (this.at().isOp(entityhuman.getName())) {
return false;
} else if (this.getSpawnProtection() <= 0) {
return false;
@@ -350,7 +351,13 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return this.propertyManager.getInt("op-permission-level", 4);
}
public void e(int i) {
super.e(i);
this.propertyManager.a("player-idle-timeout", Integer.valueOf(i));
this.a();
}
public PlayerList getPlayerList() {
return this.as();
return this.at();
}
}