Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@dab4864 {ci skip} add workflow for auto-managing issue board (#8958)
PaperMC/Paper@3c8c223 Fix some broken block place logic (#9094)
PaperMC/Paper@f5677aa Fix TPS command output (#9091)
PaperMC/Paper@e9f6e7a Properly resync player on Player#setPlayerProfile (#9080)
PaperMC/Paper@ad6c14c Fix unknown cmd msg for mc namespaced cmds (#9059)
This commit is contained in:
granny
2023-04-06 19:11:46 -07:00
parent adc78043f5
commit 1407eef7e0
13 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0063-Implement-elytra-settings.patch
View File

@@ -54,10 +54,10 @@ index 82b0bda3e35ec2157a477e1a17b2b46baadc97d9..0fc45b1048a1c4e0dc2bd1ae0437eecb
itemStack.shrink(1);
} else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index b7f234011011f8d74a65c2501c5855994bb70c3a..a6a54269a1a6028a730b56e964a465452f70ec86 100644
index ea5baa4d99028feb94ccc3ce988257e56263b3c6..cdadba82f91c599aef557b808ad4184506a6f632 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -588,7 +588,7 @@ public final class ItemStack {
@@ -582,7 +582,7 @@ public final class ItemStack {
int j;
if (amount > 0) {
@@ -66,7 +66,7 @@ index b7f234011011f8d74a65c2501c5855994bb70c3a..a6a54269a1a6028a730b56e964a46545
int k = 0;
for (int l = 0; j > 0 && l < amount; ++l) {
@@ -643,6 +643,12 @@ public final class ItemStack {
@@ -637,6 +637,12 @@ public final class ItemStack {
if (this.hurt(amount, entity.getRandom(), entity /*instanceof ServerPlayer ? (ServerPlayer) entity : null*/)) { // Paper - pass LivingEntity for EntityItemDamageEvent
breakCallback.accept(entity);
Item item = this.getItem();
@@ -99,7 +99,7 @@ index 9365f886a23a71c41091b22d46896ff18a5a0635..41bd45c0720751f348b5cf6eaecac439
entityhuman.startAutoSpinAttack(20);
if (entityhuman.isOnGround()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b36b6e836c5f221434f58143265bd36687b02b75..7a20e3b127edf85de93d1ea0d1dbee3a06f11e43 100644
index d1c45c19697408fd97448953bada1de1edc67b1d..67ffbf096e4fcd29266eb329451213c72415e439 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -114,6 +114,19 @@ public class PurpurWorldConfig {