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

22
src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java
View File

@@ -38,20 +38,20 @@ public class DedicatedServerConnectionThread extends Thread {
synchronized (this.b) {
for (int i = 0; i < this.b.size(); ++i) {
NetLoginHandler netloginhandler = (NetLoginHandler) this.b.get(i);
PendingConnection pendingconnection = (PendingConnection) this.b.get(i);
try {
netloginhandler.c();
pendingconnection.c();
} catch (Exception exception) {
netloginhandler.disconnect("Internal server error");
a.log(Level.WARNING, "Failed to handle packet for " + netloginhandler.getName() + ": " + exception, exception);
pendingconnection.disconnect("Internal server error");
a.log(Level.WARNING, "Failed to handle packet for " + pendingconnection.getName() + ": " + exception, exception);
}
if (netloginhandler.c) {
if (pendingconnection.c) {
this.b.remove(i--);
}
netloginhandler.networkManager.a();
pendingconnection.networkManager.a();
}
}
}
@@ -83,9 +83,9 @@ public class DedicatedServerConnectionThread extends Thread {
this.c.put(inetaddress, Long.valueOf(i));
}
NetLoginHandler netloginhandler = new NetLoginHandler(this.f.d(), socket, "Connection #" + this.d++);
PendingConnection pendingconnection = new PendingConnection(this.f.d(), socket, "Connection #" + this.d++);
this.a(netloginhandler);
this.a(pendingconnection);
} catch (IOException ioexception) {
a.warning("DSCT: " + ioexception.getMessage()); // CraftBukkit
}
@@ -94,14 +94,14 @@ public class DedicatedServerConnectionThread extends Thread {
System.out.println("Closing listening thread");
}
private void a(NetLoginHandler netloginhandler) {
if (netloginhandler == null) {
private void a(PendingConnection pendingconnection) {
if (pendingconnection == null) {
throw new IllegalArgumentException("Got null pendingconnection!");
} else {
List list = this.b;
synchronized (this.b) {
this.b.add(netloginhandler);
this.b.add(pendingconnection);
}
}
}