twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 12:13:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.4.6

Browse Source
This commit is contained in:
feildmaster
2012-12-19 22:03:52 -06:00
parent 9f1bf124ee
commit 23b6764374
115 changed files with 1930 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true));
// CraftBukkit end
log.info("Starting minecraft server version 1.4.5");
log.info("Starting minecraft server version 1.4.6");
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
}
@@ -101,6 +101,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false;
}
this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit
if (!this.getOnlineMode()) {
log.warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
log.warning("The server will make no attempt to authenticate usernames. Beware.");
@@ -108,7 +110,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
log.warning("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
}
this.a((ServerConfigurationManagerAbstract) (new ServerConfigurationManager(this)));
// this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit - moved up
this.convertable = new WorldLoaderServer(server.getWorldContainer()); // CraftBukkit - moved from MinecraftServer constructor
long j = System.nanoTime();
@@ -264,8 +266,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return true;
}
public ServerConfigurationManager am() {
return (ServerConfigurationManager) super.getServerConfigurationManager();
public DedicatedPlayerList am() {
return (DedicatedPlayerList) super.getPlayerList();
}
public ServerConnection ae() {
@@ -319,7 +321,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return this.propertyManager.getInt("spawn-protection", super.getSpawnProtection());
}
public ServerConfigurationManagerAbstract getServerConfigurationManager() {
public PlayerList getPlayerList() {
return this.am();
}
}