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

More teleport changes. Thanks Zeerix!

Browse Source
This commit is contained in:
EvilSeph
2011-06-08 17:00:30 -04:00
parent 5296f97cde
commit b5d1619e75
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/net/minecraft/server/NetworkManager.java
View File

@@ -93,38 +93,32 @@ public class NetworkManager {
try {
Object object;
Packet packet;
Packet packet = null; // CraftBukkit
int i;
int[] aint;
if (!this.n.isEmpty() && (this.f == 0 || System.currentTimeMillis() - ((Packet) this.n.get(0)).timestamp >= (long) this.f)) {
object = this.g;
synchronized (this.g) {
// CraftBukkit start - thread safety and prioitizing packets in this.n (high prioirty queue) over those in this.o (low priority queue).
object = this.g;
synchronized (this.g) {
long time = System.currentTimeMillis();
if (!this.n.isEmpty() && (this.f == 0 || time - ((Packet) this.n.get(0)).timestamp >= (long) this.f)) {
packet = (Packet) this.n.remove(0);
this.x -= packet.a() + 1;
}
Packet.a(packet, this.output);
aint = e;
i = packet.b();
aint[i] += packet.a() + 1;
flag = true;
}
if (this.y-- <= 0 && !this.o.isEmpty() && (this.f == 0 || System.currentTimeMillis() - ((Packet) this.o.get(0)).timestamp >= (long) this.f)) {
object = this.g;
synchronized (this.g) {
} else if (this.y-- <= 0 && !this.o.isEmpty() && (this.f == 0 || time - ((Packet) this.o.get(0)).timestamp >= (long) this.f)) {
packet = (Packet) this.o.remove(0);
this.x -= packet.a() + 1;
this.y = 0;
}
}
if (packet != null) {
Packet.a(packet, this.output);
aint = e;
i = packet.b();
aint[i] += packet.a() + 1;
this.y = 0;
flag = true;
}
// CraftBukkit end
return flag;
} catch (Exception exception) {