diff --git a/patches/server/0223-Armor-click-equip-options.patch b/patches/server/0223-Armor-click-equip-options.patch index 44cc64a4a..f1f96e5bd 100644 --- a/patches/server/0223-Armor-click-equip-options.patch +++ b/patches/server/0223-Armor-click-equip-options.patch @@ -18,7 +18,7 @@ index dd5bc68171ce5a67ecf30de65f0c1d280cc88419..38323c95dc36e5ead294670ce1201144 if (itemstack1.isDamageableItem() && itemstack1.getDamageValue() != j) { itemstack1.setDamageValue(j); diff --git a/src/main/java/net/minecraft/world/item/ArmorItem.java b/src/main/java/net/minecraft/world/item/ArmorItem.java -index dba3b8e0671ee63ff077155a8964f3e245740e7e..1efe3252465030570b253010e47ad12c5f1aa57f 100644 +index dba3b8e0671ee63ff077155a8964f3e245740e7e..6de04a38ad3708e5e51f4a4f528ac5e24c505e25 100644 --- a/src/main/java/net/minecraft/world/item/ArmorItem.java +++ b/src/main/java/net/minecraft/world/item/ArmorItem.java @@ -146,7 +146,14 @@ public class ArmorItem extends Item implements Wearable { @@ -28,7 +28,7 @@ index dba3b8e0671ee63ff077155a8964f3e245740e7e..1efe3252465030570b253010e47ad12c - return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide()); + // Purpur start + return InteractionResultHolder.success(world.purpurConfig.playerArmorSwappingCreativeMakesCopy ? itemstack : ItemStack.EMPTY); -+ } else if (world.purpurConfig.playerArmorSwapping) { ++ } else if (world.purpurConfig.playerArmorSwapping && !net.minecraft.world.item.enchantment.EnchantmentHelper.hasBindingCurse(itemstack)) { + user.setItemSlot(enumitemslot, itemstack); + user.awardStat(Stats.ITEM_USED.get(this)); + user.level.playSound(null, user.getX(), user.getY(), user.getZ(), itemstack.getEquipSound(), net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F); // we have to force the sound, for whatever reason diff --git a/patches/server/0248-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0248-Config-to-allow-mobs-to-pathfind-over-rails.patch index bd028e817..fadd31dc2 100644 --- a/patches/server/0248-Config-to-allow-mobs-to-pathfind-over-rails.patch +++ b/patches/server/0248-Config-to-allow-mobs-to-pathfind-over-rails.patch @@ -4,6 +4,19 @@ Date: Sun, 8 Aug 2021 22:50:23 -0400 Subject: [PATCH] Config to allow mobs to pathfind over rails +diff --git a/src/main/java/net/minecraft/world/item/ArmorItem.java b/src/main/java/net/minecraft/world/item/ArmorItem.java +index 6de04a38ad3708e5e51f4a4f528ac5e24c505e25..747bc81aef6e9e8a6d3b4384e30f7e97feefdc6a 100644 +--- a/src/main/java/net/minecraft/world/item/ArmorItem.java ++++ b/src/main/java/net/minecraft/world/item/ArmorItem.java +@@ -148,7 +148,7 @@ public class ArmorItem extends Item implements Wearable { + itemstack.setCount(0); + // Purpur start + return InteractionResultHolder.success(world.purpurConfig.playerArmorSwappingCreativeMakesCopy ? itemstack : ItemStack.EMPTY); +- } else if (world.purpurConfig.playerArmorSwapping && !net.minecraft.world.item.enchantment.EnchantmentHelper.hasBindingCurse(itemstack)) { ++ } else if (world.purpurConfig.playerArmorSwapping && !net.minecraft.world.item.enchantment.EnchantmentHelper.hasBindingCurse(itemstack1)) { + user.setItemSlot(enumitemslot, itemstack); + user.awardStat(Stats.ITEM_USED.get(this)); + user.level.playSound(null, user.getX(), user.getY(), user.getZ(), itemstack.getEquipSound(), net.minecraft.sounds.SoundSource.BLOCKS, 1.0F, 1.0F); // we have to force the sound, for whatever reason diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java index 60605a8a021cc56f9c3ba22bc43c43c302fb1a70..e7dc64c3ef715e3e58d79bb55546a1222c101edf 100644 --- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java