34 lines
1.9 KiB
Diff
34 lines
1.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nassim Jahnke <jahnke.nassim@gmail.com>
|
||
|
|
Date: Thu, 2 Jun 2022 20:35:58 +0200
|
||
|
|
Subject: [PATCH] Disable component selector resolving in books by default
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
index d4ff14b9e6028259c27ea9cb2b4be587ebabfb41..83121be2274a33d4188ff6fe37752432dd4e6b22 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
@@ -652,4 +652,9 @@ public class PaperConfig {
|
||
|
|
private static void useProxyProtocol() {
|
||
|
|
useProxyProtocol = getBoolean("settings.proxy-protocol", false);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public static boolean resolveSelectorsInBooks;
|
||
|
|
+ private static void resolveSelectorsInBooks() {
|
||
|
|
+ resolveSelectorsInBooks = getBoolean("settings.resolve-selectors-in-books", false);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/item/WrittenBookItem.java b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
|
||
|
|
index a324df312d9bb87d9e0962f8028d900933e70c07..de72b4abf38782061f5635dd679a20ba66f09cd5 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/item/WrittenBookItem.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
|
||
|
|
@@ -111,7 +111,7 @@ public class WrittenBookItem extends Item {
|
||
|
|
|
||
|
|
public static boolean resolveBookComponents(ItemStack book, @Nullable CommandSourceStack commandSource, @Nullable Player player) {
|
||
|
|
CompoundTag compoundTag = book.getTag();
|
||
|
|
- if (compoundTag != null && !compoundTag.getBoolean("resolved")) {
|
||
|
|
+ if (com.destroystokyo.paper.PaperConfig.resolveSelectorsInBooks && compoundTag != null && !compoundTag.getBoolean("resolved")) { // Paper
|
||
|
|
compoundTag.putBoolean("resolved", true);
|
||
|
|
if (!makeSureTagIsValid(compoundTag)) {
|
||
|
|
return false;
|