mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@73d218c1 Improve command permission lookups PaperMC/Paper@7c2ffd5e Prune the api version suffix PaperMC/Paper@c609d6dc Remove SERVER_ONLY command flag functionality PaperMC/Paper@3594d24a Properly send over SADDLE and BODY equipment items to PlayerInventory PaperMC/Paper@720e63ff Remove craft flying PaperMC/Paper@1e441025 Removed inlined art api PaperMC/Paper@adb5aefc Add api for shear equippable logic PaperMC/Paper@4604c5f2 Change ordering on YamlSanitizationTest PaperMC/Paper@c986ce54 Fix V4307 ordering issues PaperMC/Paper@48e94e8c fix sponge absorb resetting block entity data of waterlogged blocks PaperMC/Paper@c5fc0dc8 support block state mutation of already placed block entity in BlockStateListPopulator
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/net/minecraft/commands/CommandSourceStack.java
|
||||
+++ b/net/minecraft/commands/CommandSourceStack.java
|
||||
@@ -457,6 +_,19 @@
|
||||
@@ -447,6 +_,19 @@
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
public Vec3 getPosition() {
|
||||
return this.worldPosition;
|
||||
}
|
||||
@@ -541,6 +_,30 @@
|
||||
@@ -531,6 +_,30 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
}
|
||||
|
||||
if (selection.includeIntegrated) {
|
||||
@@ -535,6 +_,7 @@
|
||||
@@ -537,6 +_,7 @@
|
||||
private void runSync(ServerPlayer player, java.util.Collection<String> bukkit, RootCommandNode<CommandSourceStack> rootCommandNode) {
|
||||
// Paper end - Perf: Async command map building
|
||||
new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootCommandNode, true).callEvent(); // Paper - Brigadier API
|
||||
@@ -32,7 +32,7 @@
|
||||
org.bukkit.event.player.PlayerCommandSendEvent event = new org.bukkit.event.player.PlayerCommandSendEvent(player.getBukkitEntity(), new java.util.LinkedHashSet<>(bukkit));
|
||||
event.getPlayer().getServer().getPluginManager().callEvent(event);
|
||||
|
||||
@@ -545,6 +_,8 @@
|
||||
@@ -547,6 +_,8 @@
|
||||
}
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
this.generator = generator;
|
||||
this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment);
|
||||
|
||||
@@ -2131,4 +_,14 @@
|
||||
@@ -2124,4 +_,14 @@
|
||||
return this.id;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: granny <contact@granny.dev>
|
||||
Date: Thu, 5 Jun 2025 20:05:32 -0700
|
||||
Subject: [PATCH] fix tests
|
||||
|
||||
|
||||
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java
|
||||
index 6ecfd6209dc2c994b43d29d328668435e16c69d1..f92ce0a220b347e54252ebaf3123d5abca807c22 100644
|
||||
--- a/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java
|
||||
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java
|
||||
@@ -94,8 +94,8 @@ public class YamlSerializationTest {
|
||||
count: 1
|
||||
components:
|
||||
minecraft:unbreakable: '{}'
|
||||
+ minecraft:tooltip_display: '{hidden_components:["minecraft:unbreakable","minecraft:enchantments"]}'
|
||||
minecraft:enchantments: '{"minecraft:sharpness":2}'
|
||||
- minecraft:tooltip_display: '{hidden_components:["minecraft:enchantments","minecraft:unbreakable"]}'
|
||||
schema_version: 1
|
||||
""".formatted(Bukkit.getUnsafe().getDataVersion()));
|
||||
}
|
||||
Reference in New Issue
Block a user