Skip to content

Commit 501e7c5

Browse files
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@627cc64 Adjust HAProxy's existance to log for console masters (#11433) PaperMC/Paper@01c4820 Call EntityDropItemEvent when a container item drops its contents (#11441) PaperMC/Paper@9c76642 Deprecate for removal Block#isValidTool (#11439) PaperMC/Paper@dd6d184 Remove redundant fillUsableCommands call (#11425) PaperMC/Paper@f33611c fix ItemStack#removeEnchantments creating non-stackable items (#11442) PaperMC/Paper@8f56db8 Add enchantWithLevels with tag specification (#11438) PaperMC/Paper@b7ab22d Fix console completions on invalid commands (#7603)
1 parent 20fa61e commit 501e7c5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.21.1-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.1
5-
paperCommit = 20ec62255da0374efed5026600321f715ad94282
5+
paperCommit = b7ab22dee18865a9a3983103767a9caf46db4a3a
66

77
org.gradle.caching = true
88
org.gradle.parallel = true

patches/api/0017-ItemStack-convenience-methods.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ index de469f32dd9a01e0e2fde016044a783dde0c5b98..c7fa497381c5c5d57fda8b9c1ef26f2e
5050
+ // Purpur end
5151
}
5252
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
53-
index 7f63a3a37eb06049bd5de10466c6dd96cb5dd4ee..b6389b82b4eae033e1e770ae3967c88e950926ab 100644
53+
index b59222b8c262545d100a9fd28b3bf1d2a4cf4eb0..44a26a768c11f60241010391211a19f6b589f23c 100644
5454
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
5555
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
5656
@@ -19,6 +19,17 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -71,7 +71,7 @@ index 7f63a3a37eb06049bd5de10466c6dd96cb5dd4ee..b6389b82b4eae033e1e770ae3967c88e
7171

7272
/**
7373
* Represents a stack of items.
74-
@@ -1120,4 +1131,551 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
74+
@@ -1137,4 +1148,551 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
7575
return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
7676
}
7777
// Paper end - expose itemstack tooltip lines

patches/server/0044-Skip-events-if-there-s-no-listeners.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ Subject: [PATCH] Skip events if there's no listeners
55

66

77
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
8-
index 1d1e76de60e40224f5cb81893f9ee50fe987badb..7e291ffff86bdcdb8a0a15c211c3f84d6ae18e38 100644
8+
index 5af48400f87500166dd889c57a8df0aadb08d43d..058d13f681d7aa616846b4b6d24c668da703eb34 100644
99
--- a/src/main/java/net/minecraft/commands/Commands.java
1010
+++ b/src/main/java/net/minecraft/commands/Commands.java
11-
@@ -515,6 +515,7 @@ public class Commands {
11+
@@ -509,6 +509,7 @@ public class Commands {
1212
private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
1313
// Paper end - Perf: Async command map building
1414
new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, true).callEvent(); // Paper - Brigadier API
1515
+ if (PlayerCommandSendEvent.getHandlerList().getRegisteredListeners().length > 0) { // Purpur - skip all this crap if there's nothing listening
1616
PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
1717
event.getPlayer().getServer().getPluginManager().callEvent(event);
1818

19-
@@ -525,6 +526,7 @@ public class Commands {
19+
@@ -519,6 +520,7 @@ public class Commands {
2020
}
2121
}
2222
// CraftBukkit end

0 commit comments

Comments
 (0)