Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 19:07:44 +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@c975819 Fix inconsistencies in dispense events regarding stack size (#8653)
PaperMC/Paper@1c535f9 Remove deprecated event warning for inventory result event (#8672)
PaperMC/Paper@66437d0 Add more breakNaturally functionality (#7379)
PaperMC/Paper@7789bc5 Improve some logging and errors (#8673)
PaperMC/Paper@eec64a4 Fix explosion yield with new gamerules (#8674)
This commit is contained in:
BillyGalbreath
2022-12-15 02:30:55 -06:00
parent 2e9fa3114a
commit 1f9d676ea8
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0057-Dispenser-curse-of-binding-protection.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Dispenser curse of binding protection
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 5a5db83a973a27cabd373f429c4b34cc4a8bb57e..b6f2fbe5a2577696d62e001a3c07b52b07a33c74 100644
index c558358859f42e91d7ced4368d244fb0b10db142..0ad49a327b5939d4212331e570e5e8f9d0db85ce 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -65,6 +65,7 @@ import net.minecraft.world.item.ProjectileWeaponItem;
@@ -30,7 +30,7 @@ index 5a5db83a973a27cabd373f429c4b34cc4a8bb57e..b6f2fbe5a2577696d62e001a3c07b52b
public static Item getEquipmentForSlot(EquipmentSlot equipmentSlot, int equipmentLevel) {
switch (equipmentSlot) {
diff --git a/src/main/java/net/minecraft/world/item/ArmorItem.java b/src/main/java/net/minecraft/world/item/ArmorItem.java
index baa7e055d8ee4a153842128b07984b9f6deac6ca..014dd3aa8a7313d978d4781a1b7c6f532ff04962 100644
index 9c8604376228c02f8bbd9a15673fbdf5097e7cb2..74838807857d32a1fc5fa9a8edb27dd8067d950c 100644
--- a/src/main/java/net/minecraft/world/item/ArmorItem.java
+++ b/src/main/java/net/minecraft/world/item/ArmorItem.java
@@ -55,7 +55,7 @@ public class ArmorItem extends Item implements Wearable {
@@ -39,11 +39,11 @@ index baa7e055d8ee4a153842128b07984b9f6deac6ca..014dd3aa8a7313d978d4781a1b7c6f53
LivingEntity entityliving = (LivingEntity) list.get(0);
- EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(armor);
+ EquipmentSlot enumitemslot = pointer.getLevel().purpurConfig.dispenserApplyCursedArmor ? Mob.getEquipmentSlotForItem(armor) : Mob.getSlotForDispenser(armor); if (enumitemslot == null) return false; // Purpur
ItemStack itemstack1 = armor.split(1);
ItemStack itemstack1 = armor.copyWithCount(1); // Paper - shrink below and single item in event
// CraftBukkit start
Level world = pointer.getLevel();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ca1369c842c3ff3b45678ccce851a54c0f607b1b..4401296cc161e782c630d6bed595661af731cced 100644
index 05be7fdcc85bae35e9a506023e943cd80f9ff8b9..06be78bdd4136998005e6ac53fdc456653a7f62d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -231,6 +231,11 @@ public class PurpurWorldConfig {