Paper/nms-patches/PlayerChunkMap.patch

153 lines
4.7 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/PlayerChunkMap.java
+++ b/net/minecraft/server/PlayerChunkMap.java
2018-12-25 22:00:00 +01:00
@@ -13,6 +13,10 @@
2018-07-15 02:00:00 +02:00
import java.util.function.Predicate;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.LinkedList;
+// CraftBukkit end
+
public class PlayerChunkMap {
2018-07-15 02:00:00 +02:00
private static final Predicate<EntityPlayer> a = (entityplayer) -> {
2018-12-25 22:00:00 +01:00
@@ -32,6 +36,7 @@
2016-02-29 22:32:46 +01:00
private long k;
private boolean l = true;
private boolean m = true;
+ private boolean wasNotEmpty; // CraftBukkit - add field
public PlayerChunkMap(WorldServer worldserver) {
this.world = worldserver;
2018-12-25 22:00:00 +01:00
@@ -135,7 +140,11 @@
break;
}
}
+ // CraftBukkit start - SPIGOT-2891: remove once chunk has been provided
+ } else {
+ iterator1.remove();
}
+ // CraftBukkit end
}
}
2018-12-25 22:00:00 +01:00
@@ -197,6 +206,16 @@
2016-02-29 22:32:46 +01:00
return playerchunk;
}
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - add method
+ public final boolean isChunkInUse(int x, int z) {
2016-05-10 13:47:39 +02:00
+ PlayerChunk pi = getChunk(x, z);
+ if (pi != null) {
2018-12-13 01:00:00 +01:00
+ return (pi.players.size() > 0);
+ }
+ return false;
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
public void flagDirty(BlockPosition blockposition) {
int i = blockposition.getX() >> 4;
2015-02-26 23:41:06 +01:00
int j = blockposition.getZ() >> 4;
2018-12-25 22:00:00 +01:00
@@ -215,12 +234,22 @@
entityplayer.d = entityplayer.locX;
entityplayer.e = entityplayer.locZ;
2015-02-26 23:41:06 +01:00
2016-02-29 22:32:46 +01:00
+
+ // CraftBukkit start - Load nearby chunks first
+ List<ChunkCoordIntPair> chunkList = new LinkedList<ChunkCoordIntPair>();
2015-02-26 23:41:06 +01:00
+
2016-02-29 22:32:46 +01:00
for (int k = i - this.j; k <= i + this.j; ++k) {
for (int l = j - this.j; l <= j + this.j; ++l) {
- this.c(k, l).a(entityplayer);
+ chunkList.add(new ChunkCoordIntPair(k, l));
}
}
2016-02-29 22:32:46 +01:00
+ Collections.sort(chunkList, new ChunkCoordComparator(entityplayer));
2015-02-26 23:41:06 +01:00
+ for (ChunkCoordIntPair pair : chunkList) {
2016-02-29 22:32:46 +01:00
+ this.c(pair.x, pair.z).a(entityplayer);
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
+
this.managedPlayers.add(entityplayer);
2016-02-29 22:32:46 +01:00
this.e();
}
2018-12-25 22:00:00 +01:00
@@ -264,11 +293,14 @@
int j1 = i - k;
int k1 = j - l;
2016-02-29 22:32:46 +01:00
+ List<ChunkCoordIntPair> chunksToLoad = new LinkedList<ChunkCoordIntPair>(); // CraftBukkit
+
if (j1 != 0 || k1 != 0) {
for (int l1 = i - i1; l1 <= i + i1; ++l1) {
for (int i2 = j - i1; i2 <= j + i1; ++i2) {
if (!this.a(l1, i2, k, l, i1)) {
2016-02-29 22:32:46 +01:00
- this.c(l1, i2).a(entityplayer);
+ // this.c(l1, i2).a(entityplayer);
+ chunksToLoad.add(new ChunkCoordIntPair(l1, i2)); // CraftBukkit
}
if (!this.a(l1 - j1, i2 - k1, i, j, i1)) {
2018-12-25 22:00:00 +01:00
@@ -284,6 +316,13 @@
entityplayer.d = entityplayer.locX;
entityplayer.e = entityplayer.locZ;
2016-02-29 22:32:46 +01:00
this.e();
2015-02-26 23:41:06 +01:00
+
+ // CraftBukkit start - send nearest chunks first
+ Collections.sort(chunksToLoad, new ChunkCoordComparator(entityplayer));
2015-02-26 23:41:06 +01:00
+ for (ChunkCoordIntPair pair : chunksToLoad) {
2016-02-29 22:32:46 +01:00
+ this.c(pair.x, pair.z).a(entityplayer);
+ }
+ // CraftBukkit end
}
}
}
2018-12-25 22:00:00 +01:00
@@ -368,4 +407,47 @@
2016-05-10 13:47:39 +02:00
}
}
2015-02-26 23:41:06 +01:00
+
+ // CraftBukkit start - Sorter to load nearby chunks first
+ private static class ChunkCoordComparator implements java.util.Comparator<ChunkCoordIntPair> {
+ private int x;
+ private int z;
+
+ public ChunkCoordComparator (EntityPlayer entityplayer) {
+ x = (int) entityplayer.locX >> 4;
+ z = (int) entityplayer.locZ >> 4;
+ }
+
+ public int compare(ChunkCoordIntPair a, ChunkCoordIntPair b) {
+ if (a.equals(b)) {
+ return 0;
+ }
+
+ // Subtract current position to set center point
+ int ax = a.x - this.x;
+ int az = a.z - this.z;
+ int bx = b.x - this.x;
+ int bz = b.z - this.z;
+
+ int result = ((ax - bx) * (ax + bx)) + ((az - bz) * (az + bz));
+ if (result != 0) {
+ return result;
+ }
+
+ if (ax < 0) {
+ if (bx < 0) {
+ return bz - az;
+ } else {
+ return -1;
+ }
+ } else {
+ if (bx < 0) {
+ return 1;
+ } else {
+ return az - bz;
+ }
+ }
+ }
+ }
+ // CraftBukkit end
}