geforkt von Mirrors/Paper
de04cbced5
Upstream has released updates that appear 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: f29cb801 Separate checkstyle-suppressions file is not required 86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack 9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode() 994a6163 Attempt upgrade of resolver libraries CraftBukkit Changes: b3b43a6ad Add Checkstyle check for unused imports 13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names 3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API 2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor 1dbdbbed4 PR-1238: Remove unnecessary sign ticking 659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper e37e29ce0 Increase outdated build delay c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack 492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode() e11fbb9d7 Upgrade MySQL driver 9f3a0bd2a Attempt upgrade of resolver libraries 60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion Spigot Changes: 06d602e7 Rebuild patches
35 Zeilen
1.7 KiB
Diff
35 Zeilen
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 21 Dec 2020 11:01:42 -0500
|
|
Subject: [PATCH] Optimize Dynamic#get Missing Keys
|
|
|
|
get was calling toString() on every NBT object that was ever asked for an optional
|
|
key from the object to build a string for the error text.
|
|
|
|
When done on large NBT objects, this was using a ton of computation time building the
|
|
JSON representation of the NBT object.
|
|
|
|
Now we will just skip the value when 99.9999% of the time the text is never even printed.
|
|
|
|
diff --git a/src/main/java/com/mojang/serialization/Dynamic.java b/src/main/java/com/mojang/serialization/Dynamic.java
|
|
index a24cc02a62585d7c04d36456739b11bddccf1a15..683f516b86f246792dcb3d6f9a738fc14155d2f6 100644
|
|
--- a/src/main/java/com/mojang/serialization/Dynamic.java
|
|
+++ b/src/main/java/com/mojang/serialization/Dynamic.java
|
|
@@ -17,6 +17,7 @@ import java.util.stream.Stream;
|
|
|
|
@SuppressWarnings("unused")
|
|
public class Dynamic<T> extends DynamicLike<T> {
|
|
+ private static final boolean DEBUG_MISSING_KEYS = Boolean.getBoolean("Paper.debugDynamicMissingKeys"); // Paper
|
|
private final T value;
|
|
|
|
public Dynamic(final DynamicOps<T> ops) {
|
|
@@ -113,7 +114,7 @@ public class Dynamic<T> extends DynamicLike<T> {
|
|
return new OptionalDynamic<>(ops, ops.getMap(value).flatMap(m -> {
|
|
final T value = m.get(key);
|
|
if (value == null) {
|
|
- return DataResult.error(() -> "key missing: " + key + " in " + this.value);
|
|
+ return DataResult.error(() -> DEBUG_MISSING_KEYS ? "key missing: " + key + " in " + this.value : "key missing: " + key); // Paper
|
|
}
|
|
return DataResult.success(new Dynamic<>(ops, value));
|
|
}));
|