mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 19:15:32 +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
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
From 65fb379ec37d63e7411e9bc0ec15a257ae1d940b Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 5 Apr 2016 21:38:58 -0400
|
|
Subject: [PATCH] Remove Debug checks from DataBits
|
|
|
|
These are super hot and causing noticeable hits
|
|
|
|
Before: http://i.imgur.com/nQsMzAE.png
|
|
After: http://i.imgur.com/nJ46crB.png
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
|
|
index 409dc837c6..4194acc8b9 100644
|
|
--- a/src/main/java/net/minecraft/server/DataBits.java
|
|
+++ b/src/main/java/net/minecraft/server/DataBits.java
|
|
@@ -14,7 +14,7 @@ public class DataBits {
|
|
}
|
|
|
|
public DataBits(int i, int j, long[] along) {
|
|
- Validate.inclusiveBetween(1L, 32L, (long) i);
|
|
+ //Validate.inclusiveBetween(1L, 32L, (long) i); // Paper
|
|
this.d = j;
|
|
this.b = i;
|
|
this.a = along;
|
|
@@ -27,8 +27,8 @@ public class DataBits {
|
|
}
|
|
|
|
public int a(int i, int j) {
|
|
- Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i);
|
|
- Validate.inclusiveBetween(0L, this.c, (long) j);
|
|
+ //Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); // Paper
|
|
+ //Validate.inclusiveBetween(0L, this.c, (long) j); // Paper
|
|
int k = i * this.b;
|
|
int l = k >> 6;
|
|
int i1 = (i + 1) * this.b - 1 >> 6;
|
|
@@ -49,8 +49,8 @@ public class DataBits {
|
|
}
|
|
|
|
public void b(int i, int j) {
|
|
- Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i);
|
|
- Validate.inclusiveBetween(0L, this.c, (long) j);
|
|
+ //Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); // Paper
|
|
+ //Validate.inclusiveBetween(0L, this.c, (long) j); // Paper
|
|
int k = i * this.b;
|
|
int l = k >> 6;
|
|
int i1 = (i + 1) * this.b - 1 >> 6;
|
|
@@ -67,7 +67,7 @@ public class DataBits {
|
|
}
|
|
|
|
public int a(int i) {
|
|
- Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i);
|
|
+ //Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); // Paper
|
|
int j = i * this.b;
|
|
int k = j >> 6;
|
|
int l = (i + 1) * this.b - 1 >> 6;
|
|
--
|
|
2.21.0
|
|
|