finish applying patches for 1.19.4

2026-02-22 19:07:44 +01:00 · 2023-03-15 05:49:00 -07:00
parent 67066cdd46
commit 1dea120002
369 changed files with 3455 additions and 3946 deletions
--- a/patches/server/0061-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0061-Mending-mends-most-damages-equipment-first.patch
@@ -1,94 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 14 Jul 2019 19:52:47 -0500
-Subject: [PATCH] Mending mends most damages equipment first
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index cf5c7e8557b0084039a94ef881a36aa9e3f58daf..e3148983e1bf6f7c972a5794d99c03f7061d21a0 100644
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -323,7 +323,7 @@ public class ExperienceOrb extends Entity {
-     }
- 
-     private int repairPlayerItems(Player player, int amount) {
-        Entry<EquipmentSlot, ItemStack> entry = EnchantmentHelper.getRandomItemWith(Enchantments.MENDING, player, ItemStack::isDamaged);
-+        Entry<EquipmentSlot, ItemStack> entry = level.purpurConfig.useBetterMending ? EnchantmentHelper.getMostDamagedEquipment(Enchantments.MENDING, player) : EnchantmentHelper.getRandomItemWith(Enchantments.MENDING, player, ItemStack::isDamaged); // Purpur
- 
-         if (entry != null) {
-             ItemStack itemstack = (ItemStack) entry.getValue();
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 6860096cb8c0deecc9c1d87543d1128fb95fd2d4..16fb80fba4cd7dc72ffd985530f2b8ed2dcc8330 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -544,6 +544,16 @@ public final class ItemStack {
-         return this.isDamageableItem() && this.getDamageValue() > 0;
-     }
- 
-+    // Purpur start
-+    public float getDamagePercent() {
-+        if (isDamaged()) {
-+            return (float) getDamageValue() / (float) getItem().getMaxDamage();
-+        } else {
-+            return 0F;
-+        }
-+    }
-+    // Purpur end
-+
-     public int getDamageValue() {
-         return this.tag == null ? 0 : this.tag.getInt("Damage");
-     }
-diff --git a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-index 064783822333d11120daa28f3be5099e10510b72..659cd2d43d3cabc9bcc50857d6de858f417b7c31 100644
--- a/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-+++ b/src/main/java/net/minecraft/world/item/enchantment/EnchantmentHelper.java
-@@ -274,6 +274,29 @@ public class EnchantmentHelper {
-         return getItemEnchantmentLevel(Enchantments.CHANNELING, stack) > 0;
-     }
- 
-+    // Purpur start
-+    @Nullable
-+    public static Map.Entry<EquipmentSlot, ItemStack> getMostDamagedEquipment(Enchantment enchantment, LivingEntity entity) {
-+        Map<EquipmentSlot, ItemStack> map = enchantment.getSlotItems(entity);
-+        if (map.isEmpty()) {
-+            return null;
-+        }
-+        Map.Entry<EquipmentSlot, ItemStack> item = null;
-+        float maxPercent = 0F;
-+        for (Map.Entry<EquipmentSlot, ItemStack> entry : map.entrySet()) {
-+            ItemStack itemstack = entry.getValue();
-+            if (!itemstack.isEmpty() && itemstack.isDamaged() && getItemEnchantmentLevel(enchantment, itemstack) > 0) {
-+                float percent = itemstack.getDamagePercent();
-+                if (item == null || percent > maxPercent) {
-+                    item = entry;
-+                    maxPercent = percent;
-+                }
-+            }
-+        }
-+        return item;
-+    }
-+    // Purpur end
-+
-     @Nullable
-     public static Map.Entry<EquipmentSlot, ItemStack> getRandomItemWith(Enchantment enchantment, LivingEntity entity) {
-         return getRandomItemWith(enchantment, entity, (stack) -> {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d209b34225d3cb7bf4cb6346aa31ea738c321bfc..ee80adb562a1cdc7b0cc47ef156f5c42fe20ae9c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -98,6 +98,7 @@ public class PurpurWorldConfig {
-         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
-     }
- 
-+    public boolean useBetterMending = false;
-     public boolean boatEjectPlayersOnLand = false;
-     public boolean disableDropsOnCrammingDeath = false;
-     public boolean milkCuresBadOmen = true;
-@@ -105,6 +106,7 @@ public class PurpurWorldConfig {
-     public double voidDamageHeight = -64.0D;
-     public double voidDamageDealt = 4.0D;
-     private void miscGameplayMechanicsSettings() {
-+        useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
-         boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-         disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
-         milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);