mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From acd3e26def5fdb90fad703740cd0c0a13ebe01cc Mon Sep 17 00:00:00 2001
|
|
From: Antony Riley <antony@cyberiantiger.org>
|
|
Date: Tue, 29 Mar 2016 06:56:23 +0300
|
|
Subject: [PATCH] Reduce IO ops opening a new region file.
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
|
|
index b062a31c49..4e6288e8bb 100644
|
|
--- a/src/main/java/net/minecraft/server/RegionFile.java
|
|
+++ b/src/main/java/net/minecraft/server/RegionFile.java
|
|
@@ -26,7 +26,7 @@ public class RegionFile implements AutoCloseable {
|
|
private final File file;
|
|
// Spigot end
|
|
private static final byte[] a = new byte[4096];
|
|
- private final RandomAccessFile b;
|
|
+ private final RandomAccessFile b; private RandomAccessFile getDataFile() { return this.b; } // Paper - OBFHELPER
|
|
private final int[] c = new int[1024];
|
|
private final int[] d = new int[1024];
|
|
private final List<Boolean> e;
|
|
@@ -59,10 +59,19 @@ public class RegionFile implements AutoCloseable {
|
|
this.e.set(1, false);
|
|
this.b.seek(0L);
|
|
|
|
+ // Paper Start
|
|
+ java.nio.ByteBuffer header = java.nio.ByteBuffer.allocate(8192);
|
|
+ while (header.hasRemaining()) {
|
|
+ if (this.getDataFile().getChannel().read(header) == -1) throw new java.io.EOFException();
|
|
+ }
|
|
+ header.clear();
|
|
+ java.nio.IntBuffer headerAsInts = header.asIntBuffer();
|
|
+ // Paper End
|
|
+
|
|
int k;
|
|
|
|
for (j = 0; j < 1024; ++j) {
|
|
- k = this.b.readInt();
|
|
+ k = headerAsInts.get(); // Paper
|
|
this.c[j] = k;
|
|
// Spigot start
|
|
int length = k & 255;
|
|
@@ -88,7 +97,7 @@ public class RegionFile implements AutoCloseable {
|
|
}
|
|
|
|
for (j = 0; j < 1024; ++j) {
|
|
- k = this.b.readInt();
|
|
+ k = headerAsInts.get(); // Paper
|
|
this.d[j] = k;
|
|
}
|
|
|
|
--
|
|
2.21.0
|
|
|