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@18fabc0 Remove CraftItemStack#setAmount null assignment (#8807)
PaperMC/Paper@9147456 Updated Upstream (CraftBukkit/Spigot) (#8815)
PaperMC/Paper@4da844f Fix force-opening enchantment tables (#8820)
This commit is contained in:
granny
2023-01-31 19:41:34 -08:00
parent 789233aa7f
commit c44c800b3a
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 406f067011dd46696564214d2afd76460ee22384..039212093b5e2671fb6d53371bfe48da4d0c116b 100644
index 3a60ff6ef2dfbc0b4c5d81c629e555f4a612a02a..e7f94a0684e4b38543ac34ffb3b8bed8ace551b1 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3515,7 +3515,16 @@ public abstract class LivingEntity extends Entity {
@@ -54,10 +54,10 @@ index 783791cf501d6ed3975aa82b958d7437158909ba..eb093b151e2d04476e38e3e066688823
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 6538405cae3b601dd19254a0b59c37f9e54f74c8..7d721cf67b688dfd05d8d847c47626de1f6f3392 100644
index 16fb80fba4cd7dc72ffd985530f2b8ed2dcc8330..6acd0002a29a698ef5f993bad28bbe8e646eed48 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -572,7 +572,7 @@ public final class ItemStack {
@@ -573,7 +573,7 @@ public final class ItemStack {
int j;
if (amount > 0) {
@@ -66,7 +66,7 @@ index 6538405cae3b601dd19254a0b59c37f9e54f74c8..7d721cf67b688dfd05d8d847c47626de
int k = 0;
for (int l = 0; j > 0 && l < amount; ++l) {
@@ -627,6 +627,12 @@ public final class ItemStack {
@@ -628,6 +628,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 69b1b87bf38577a78a6cf3f3925bf04b653d63ea..41d0db18b0358061c5b6e12118619a4128f16273 100644
index ee80adb562a1cdc7b0cc47ef156f5c42fe20ae9c..e00b3d564416917e6b6cd0de4eb2281754b763a2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -115,6 +115,19 @@ public class PurpurWorldConfig {