Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 13:36:16 +01:00
Code Issues 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
Show Stats 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 { try {
Object object; Object object;
Packet packet; Packet packet = null; // CraftBukkit
int i; int i;
int[] aint; int[] aint;
if (!this.n.isEmpty() && (this.f == 0 || System.currentTimeMillis() - ((Packet) this.n.get(0)).timestamp >= (long) this.f)) { // CraftBukkit start - thread safety and prioitizing packets in this.n (high prioirty queue) over those in this.o (low priority queue).
object = this.g; object = this.g;
synchronized (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); packet = (Packet) this.n.remove(0);
this.x -= packet.a() + 1; this.x -= packet.a() + 1;
} } else if (this.y-- <= 0 && !this.o.isEmpty() && (this.f == 0 || time - ((Packet) this.o.get(0)).timestamp >= (long) this.f)) {
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) {
packet = (Packet) this.o.remove(0); packet = (Packet) this.o.remove(0);
this.x -= packet.a() + 1; this.x -= packet.a() + 1;
this.y = 0;
} }
}
if (packet != null) {
Packet.a(packet, this.output); Packet.a(packet, this.output);
aint = e; aint = e;
i = packet.b(); i = packet.b();
aint[i] += packet.a() + 1; aint[i] += packet.a() + 1;
this.y = 0;
flag = true; flag = true;
} }
// CraftBukkit end
return flag; return flag;
} catch (Exception exception) { } catch (Exception exception) {

26
src/main/java/net/minecraft/server/PlayerManager.java
View File

@ -3,6 +3,11 @@ package net.minecraft.server;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
// CraftBukkit start
import java.util.Collections;
import java.util.Comparator;
// CraftBukkit end
public class PlayerManager { public class PlayerManager {
public List a = new ArrayList(); public List a = new ArrayList();
@ -134,14 +139,6 @@ public class PlayerManager {
int i1 = i - k; int i1 = i - k;
int j1 = j - l; int j1 = j - l;
// CraftBukkit start
if (i1 > this.f || i1 < -this.f || j1 > this.f || j1 < -this.f) {
this.removePlayer(entityplayer);
this.addPlayer(entityplayer);
return;
}
// CraftBukkit end
if (i1 != 0 || j1 != 0) { if (i1 != 0 || j1 != 0) {
for (int k1 = i - this.f; k1 <= i + this.f; ++k1) { for (int k1 = i - this.f; k1 <= i + this.f; ++k1) {
for (int l1 = j - this.f; l1 <= j + this.f; ++l1) { for (int l1 = j - this.f; l1 <= j + this.f; ++l1) {
@ -161,6 +158,19 @@ public class PlayerManager {
entityplayer.d = entityplayer.locX; entityplayer.d = entityplayer.locX;
entityplayer.e = entityplayer.locZ; entityplayer.e = entityplayer.locZ;
// CraftBukkit start - send nearest chunks first
if (i1 > 1 || i1 < -1 || j1 > 1 || j1 < -1) {
final int x = i;
final int z = j;
List<ChunkCoordIntPair> chunksToSend = entityplayer.f;
Collections.sort(chunksToSend, new Comparator<ChunkCoordIntPair>() {
public int compare(ChunkCoordIntPair a, ChunkCoordIntPair b) {
return Math.max(Math.abs(a.x-x), Math.abs(a.z-z)) - Math.max(Math.abs(b.x-x), Math.abs(b.z-z));
}
});
}
// CraftBukkit end
} }
} }
} }