3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-21 05:50:05 +01:00
Paper/nms-patches/ChunkRegionLoader.patch

118 Zeilen
4.5 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/ChunkRegionLoader.java
+++ b/net/minecraft/server/ChunkRegionLoader.java
2016-05-10 13:47:39 +02:00
@@ -29,8 +29,36 @@
2016-02-29 22:32:46 +01:00
this.e = dataconvertermanager;
}
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
+ public boolean chunkExists(World world, int i, int j) {
+ ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
2014-11-29 21:00:52 +01:00
+
2015-05-05 22:43:47 +02:00
+ if (this.c.contains(chunkcoordintpair)) {
+ if (this.b.containsKey(chunkcoordintpair)) {
+ return true;
+ }
+ }
2015-02-26 23:41:06 +01:00
+
2015-05-05 22:43:47 +02:00
+ return RegionFileCache.a(this.d, i, j).chunkExists(i & 31, j & 31);
+ }
+ // CraftBukkit end
+
+ // CraftBukkit start - Add async variant, provide compatibility
2016-05-10 13:47:39 +02:00
@Nullable
2015-02-26 23:41:06 +01:00
public Chunk a(World world, int i, int j) throws IOException {
+ Object[] data = loadChunk(world, i, j);
+ if (data != null) {
+ Chunk chunk = (Chunk) data[0];
+ NBTTagCompound nbttagcompound = (NBTTagCompound) data[1];
+ loadEntities(chunk, nbttagcompound.getCompound("Level"), world);
+ return chunk;
+ }
2015-02-26 23:41:06 +01:00
+
+ return null;
+ }
2015-02-26 23:41:06 +01:00
+
+ public Object[] loadChunk(World world, int i, int j) throws IOException {
+ // CraftBukkit end
ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
2015-05-05 22:43:47 +02:00
NBTTagCompound nbttagcompound = (NBTTagCompound) this.b.get(chunkcoordintpair);
2016-05-10 13:47:39 +02:00
@@ -47,7 +75,7 @@
return this.a(world, i, j, nbttagcompound);
}
- protected Chunk a(World world, int i, int j, NBTTagCompound nbttagcompound) {
+ protected Object[] a(World world, int i, int j, NBTTagCompound nbttagcompound) { // CraftBukkit - return Chunk -> Object[]
if (!nbttagcompound.hasKeyOfType("Level", 10)) {
ChunkRegionLoader.a.error("Chunk file at " + i + "," + j + " is missing level data, skipping");
return null;
2016-05-10 13:47:39 +02:00
@@ -64,10 +92,28 @@
2015-02-26 23:41:06 +01:00
ChunkRegionLoader.a.error("Chunk file at " + i + "," + j + " is in the wrong location; relocating. (Expected " + i + ", " + j + ", got " + chunk.locX + ", " + chunk.locZ + ")");
nbttagcompound1.setInt("xPos", i);
nbttagcompound1.setInt("zPos", j);
+
+ // CraftBukkit start - Have to move tile entities since we don't load them at this stage
+ NBTTagList tileEntities = nbttagcompound.getCompound("Level").getList("TileEntities", 10);
+ if (tileEntities != null) {
+ for (int te = 0; te < tileEntities.size(); te++) {
+ NBTTagCompound tileEntity = (NBTTagCompound) tileEntities.get(te);
+ int x = tileEntity.getInt("x") - chunk.locX * 16;
+ int z = tileEntity.getInt("z") - chunk.locZ * 16;
+ tileEntity.setInt("x", i * 16 + x);
+ tileEntity.setInt("z", j * 16 + z);
+ }
+ }
2015-02-26 23:41:06 +01:00
+ // CraftBukkit end
chunk = this.a(world, nbttagcompound1);
}
- return chunk;
+ // CraftBukkit start
+ Object[] data = new Object[2];
+ data[0] = chunk;
+ data[1] = nbttagcompound;
+ return data;
+ // CraftBukkit end
}
}
}
2016-05-10 13:47:39 +02:00
@@ -296,6 +342,13 @@
chunk.a(nbttagcompound.getByteArray("Biomes"));
}
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - End this method here and split off entity loading to another method
+ return chunk;
+ }
2015-02-26 23:41:06 +01:00
+
+ public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) {
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10);
if (nbttaglist1 != null) {
2016-05-10 13:47:39 +02:00
@@ -339,7 +392,7 @@
}
}
- return chunk;
2015-02-26 23:41:06 +01:00
+ // return chunk; // CraftBukkit
}
2016-02-29 22:32:46 +01:00
2016-05-10 13:47:39 +02:00
@Nullable
@@ -403,8 +456,14 @@
2016-02-29 22:32:46 +01:00
}
}
+ // CraftBukkit start
public static void a(Entity entity, World world) {
- if (world.addEntity(entity) && entity.isVehicle()) {
+ a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
+ }
+
+ public static void a(Entity entity, World world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
+ if (world.addEntity(entity, reason) && entity.isVehicle()) {
+ // CraftBukkit end
2016-05-10 13:47:39 +02:00
Iterator iterator = entity.bv().iterator();
2016-02-29 22:32:46 +01:00
while (iterator.hasNext()) {