Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions 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

114
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@@ -51,28 +51,29 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
private boolean allowFlight;
private String motd;
private int D;
private long E;
private int E;
private long F;
private long G;
private long H;
private long I;
public final long[] f;
public final long[] g;
public final long[] h;
public final long[] i;
public final long[] j;
public long[][] k;
private KeyPair I;
private String J;
private KeyPair J;
private String K;
private String L;
private boolean demoMode;
private boolean N;
private boolean O;
private String P;
private boolean Q;
private long R;
private String S;
private boolean T;
private boolean P;
private String Q;
private boolean R;
private long S;
private String T;
private boolean U;
private boolean V;
// CraftBukkit start
public List<WorldServer> worlds = new ArrayList<WorldServer>();
@@ -89,17 +90,18 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public MinecraftServer(OptionSet options) { // CraftBukkit - signature file -> OptionSet
this.c = Proxy.NO_PROXY;
this.E = 0;
this.f = new long[100];
this.g = new long[100];
this.h = new long[100];
this.i = new long[100];
this.j = new long[100];
this.P = "";
this.Q = "";
l = this;
// this.universe = file1; // CraftBukkit
this.q = new CommandDispatcher();
// this.convertable = new WorldLoaderServer(server.getWorldContainer()); // CraftBukkit - moved to DedicatedServer.init
this.ar();
this.as();
// CraftBukkit start
this.options = options;
@@ -126,7 +128,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public abstract PropertyManager getPropertyManager();
// CraftBukkit end
private void ar() {
private void as() {
DispenserRegistry.a();
}
@@ -141,7 +143,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
protected synchronized void b(String s) {
this.S = s;
this.T = s;
}
protected void a(String s, String s1, long i, WorldType worldtype, String s2) {
@@ -314,7 +316,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
protected void saveChunks(boolean flag) throws ExceptionWorldConflict { // CraftBukkit - added throws
if (!this.O) {
if (!this.P) {
// CraftBukkit start
for (int j = 0; j < this.worlds.size(); ++j) {
WorldServer worldserver = this.worlds.get(j);
@@ -336,7 +338,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public void stop() throws ExceptionWorldConflict { // CraftBukkit - added throws
if (!this.O) {
if (!this.P) {
this.getLogger().info("Stopping server");
// CraftBukkit start
if (this.server != null) {
@@ -391,15 +393,15 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
if (this.init()) {
long i = aq();
for (long j = 0L; this.isRunning; this.Q = true) {
for (long j = 0L; this.isRunning; this.R = true) {
long k = aq();
long l = k - i;
if (l > 2000L && i - this.R >= 15000L) {
if (l > 2000L && i - this.S >= 15000L) {
if (this.server.getWarnOnOverload()) // CraftBukkit - Added option to suppress warning messages
this.getLogger().warning("Can\'t keep up! Did the system time change, or is the server overloaded?");
l = 2000L;
this.R = i;
this.S = i;
}
if (l < 0L) {
@@ -476,8 +478,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
AxisAlignedBB.a().a();
++this.ticks;
if (this.T) {
this.T = false;
if (this.U) {
this.U = false;
this.methodProfiler.a = true;
this.methodProfiler.a();
}
@@ -493,14 +495,14 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.methodProfiler.a("tallying");
this.j[this.ticks % 100] = System.nanoTime() - i;
this.f[this.ticks % 100] = Packet.q - this.E;
this.E = Packet.q;
this.g[this.ticks % 100] = Packet.r - this.F;
this.F = Packet.r;
this.h[this.ticks % 100] = Packet.o - this.G;
this.G = Packet.o;
this.i[this.ticks % 100] = Packet.p - this.H;
this.H = Packet.p;
this.f[this.ticks % 100] = Packet.q - this.F;
this.F = Packet.q;
this.g[this.ticks % 100] = Packet.r - this.G;
this.G = Packet.r;
this.h[this.ticks % 100] = Packet.o - this.H;
this.H = Packet.o;
this.i[this.ticks % 100] = Packet.p - this.I;
this.I = Packet.p;
this.methodProfiler.b();
this.methodProfiler.a("snooper");
if (!this.n.d() && this.ticks > 100) {
@@ -698,7 +700,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
if (flag) {
dedicatedserver.at();
dedicatedserver.au();
}
*/
@@ -755,7 +757,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public String getVersion() {
return "1.6.2";
return "1.6.4";
}
public int A() {
@@ -922,7 +924,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public KeyPair H() {
return this.I;
return this.J;
}
public int I() {
@@ -934,27 +936,27 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public String J() {
return this.J;
}
public void j(String s) {
this.J = s;
}
public boolean K() {
return this.J != null;
}
public String L() {
return this.K;
}
public void k(String s) {
public void j(String s) {
this.K = s;
}
public boolean K() {
return this.K != null;
}
public String L() {
return this.L;
}
public void k(String s) {
this.L = s;
}
public void a(KeyPair keypair) {
this.I = keypair;
this.J = keypair;
}
public void c(int i) {
@@ -991,7 +993,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public void c(boolean flag) {
this.N = flag;
this.O = flag;
}
public Convertable getConvertable() {
@@ -999,7 +1001,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public void R() {
this.O = true;
this.P = true;
this.getConvertable().d();
// CraftBukkit start - This needs review, what does it do? (it's new)
@@ -1017,11 +1019,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public String getTexturePack() {
return this.P;
return this.Q;
}
public void setTexturePack(String s) {
this.P = s;
this.Q = s;
}
public void a(MojangStatisticsGenerator mojangstatisticsgenerator) {
@@ -1170,7 +1172,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public void ak() {
this.T = true;
this.U = true;
}
public ChunkCoordinates b() {
@@ -1192,11 +1194,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public abstract IConsoleLogManager getLogger();
public void setForceGamemode(boolean flag) {
this.U = flag;
this.V = flag;
}
public boolean getForceGamemode() {
return this.U;
return this.V;
}
public Proxy ap() {
@@ -1207,6 +1209,14 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
return System.currentTimeMillis();
}
public int ar() {
return this.E;
}
public void e(int i) {
this.E = i;
}
public static PlayerList a(MinecraftServer minecraftserver) {
return minecraftserver.t;
}