core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0362-Don-t-check-ConvertSig...

33 lines
1.4 KiB
Diff
Raw Normal View History

Updated Upstream (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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
2019-06-06 15:36:57 +00:00
From 3e9ec2ffc5ef7ece527de327f022187750b9e149 Mon Sep 17 00:00:00 2001
don't check convert signs boolean every sign save that lookup isn't "cheap", and synchronizes so cache it to a boolean instead
2019-03-02 20:29:09 +00:00
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
Updated Upstream (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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
2019-06-06 15:36:57 +00:00
index caeaca4c7a..dd7889a4f9 100644
don't check convert signs boolean every sign save that lookup isn't "cheap", and synchronizes so cache it to a boolean instead
2019-03-02 20:29:09 +00:00
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
@@ -18,6 +18,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
don't check convert signs boolean every sign save that lookup isn't "cheap", and synchronizes so cache it to a boolean instead
2019-03-02 20:29:09 +00:00
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() {
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
@@ -36,7 +37,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
don't check convert signs boolean every sign save that lookup isn't "cheap", and synchronizes so cache it to a boolean instead
2019-03-02 20:29:09 +00:00
}
// CraftBukkit start
- if (Boolean.getBoolean("convertLegacySigns")) {
+ if (CONVERT_LEGACY_SIGNS) { // Paper
nbttagcompound.setBoolean("Bukkit.isConverted", true);
}
// CraftBukkit end
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
2019-03-20 00:28:15 +00:00
2.21.0
don't check convert signs boolean every sign save that lookup isn't "cheap", and synchronizes so cache it to a boolean instead
2019-03-02 20:29:09 +00:00