From 23711581b2f67394e3d7f86b866b0242978784fd Mon Sep 17 00:00:00 2001 From: Github Action Date: Fri, 15 Jul 2022 19:24:11 +0000 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@db9c5ad port PaperMC/Paper#7822 --- gradle.properties | 2 +- ...8-Add-ability-to-disable-repair-cost-for-ItemStack.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1b763a1..0c8371f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.sharkurmc.sharkur version = 1.19-R0.1-SNAPSHOT -purpurCommit = 38f22462f3e431c8517422b57c4d553aab9ddc64 +purpurCommit = db9c5adb604e86bfd2f2ddda5e651ad32a5971c2 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0008-Add-ability-to-disable-repair-cost-for-ItemStack.patch b/patches/server/0008-Add-ability-to-disable-repair-cost-for-ItemStack.patch index 5f2fd88..8a497ca 100644 --- a/patches/server/0008-Add-ability-to-disable-repair-cost-for-ItemStack.patch +++ b/patches/server/0008-Add-ability-to-disable-repair-cost-for-ItemStack.patch @@ -17,10 +17,10 @@ index 0ecda463452a3f9205dfbd97f28ae7cff5fa7698..206a97d910c3372eab4e327cf96510bd sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client this.broadcastChanges(); diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 4ec80c52cbee9b484e47a93551df4dbf62f6d83e..bd140f865a978f53d80d6556cf2081f405a670cb 100644 +index 5c84b0f8478d20dc3c1593118addeabea28c8e73..82d6a51a28981278ba344baddf9f1fe0bb0ba715 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -228,6 +228,7 @@ public final class ItemStack { +@@ -229,6 +229,7 @@ public final class ItemStack { this.count = count; if (this.item != null && this.item.canBeDepleted()) { this.setDamageValue(this.getDamageValue()); @@ -28,7 +28,7 @@ index 4ec80c52cbee9b484e47a93551df4dbf62f6d83e..bd140f865a978f53d80d6556cf2081f4 } this.updateEmptyCacheFlag(); -@@ -1184,10 +1185,12 @@ public final class ItemStack { +@@ -1185,10 +1186,12 @@ public final class ItemStack { } public int getBaseRepairCost() {