mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-15 07:01:36 +08: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
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From 7a7ca9f0480c654010590213d2b54642aa28324f Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 2 Mar 2019 11:11:29 -0500
|
|
Subject: [PATCH] Don't check ConvertSigns boolean every sign save
|
|
|
|
property lookups arent super cheap. they synchronize, validate
|
|
and check security managers.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
|
|
index caeaca4c7a..dd7889a4f9 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
|
|
@@ -18,6 +18,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
|
private static final boolean keepInvalidUnicode = Boolean.getBoolean("Paper.keepInvalidUnicode"); // Allow people to keep their bad unicode if they really want it
|
|
private boolean privateUnicodeRemoved = false;
|
|
public java.util.UUID signEditor;
|
|
+ private static final boolean CONVERT_LEGACY_SIGNS = Boolean.getBoolean("convertLegacySigns");
|
|
// Paper end
|
|
|
|
public TileEntitySign() {
|
|
@@ -36,7 +37,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
|
}
|
|
|
|
// CraftBukkit start
|
|
- if (Boolean.getBoolean("convertLegacySigns")) {
|
|
+ if (CONVERT_LEGACY_SIGNS) { // Paper
|
|
nbttagcompound.setBoolean("Bukkit.isConverted", true);
|
|
}
|
|
// CraftBukkit end
|
|
--
|
|
2.21.0
|
|
|