From 5af1dfa5cb089f227ae58df5aa9482cb97187372 Mon Sep 17 00:00:00 2001 From: TonytheMacaroni <tonythemacaroni123@gmail.com> Date: Fri, 24 May 2024 13:52:54 -0400 Subject: [PATCH] Use getter/setter on Mob for equipment drop chances (#10780) --- ...t-set-drop-chance-to-EntityEquipment.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/patches/server/add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/add-get-set-drop-chance-to-EntityEquipment.patch index e6265936a2..a435f0c990 100644 --- a/patches/server/add-get-set-drop-chance-to-EntityEquipment.patch +++ b/patches/server/add-get-set-drop-chance-to-EntityEquipment.patch @@ -3,6 +3,8 @@ From: Jake Potrebic <jake.m.potrebic@gmail.com> Date: Thu, 22 Apr 2021 00:28:11 -0700 Subject: [PATCH] add get-set drop chance to EntityEquipment +== AT == +public net.minecraft.world.entity.Mob getEquipmentDropChance(Lnet/minecraft/world/entity/EquipmentSlot;)F diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 @@ -26,6 +28,28 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private void setDropChance(net.minecraft.world.entity.EquipmentSlot slot, float chance) { Preconditions.checkArgument(this.entity.getHandle() instanceof Mob, "Cannot set drop chance for non-Mob entity"); + +- if (slot == net.minecraft.world.entity.EquipmentSlot.MAINHAND || slot == net.minecraft.world.entity.EquipmentSlot.OFFHAND) { +- ((Mob) this.entity.getHandle()).handDropChances[slot.getIndex()] = chance; +- } else { +- ((Mob) this.entity.getHandle()).armorDropChances[slot.getIndex()] = chance; +- } ++ ((Mob) this.entity.getHandle()).setDropChance(slot, chance); // Paper - use setter on Mob + } + + private float getDropChance(net.minecraft.world.entity.EquipmentSlot slot) { +@@ -0,0 +0,0 @@ public class CraftEntityEquipment implements EntityEquipment { + return 1; + } + +- if (slot == net.minecraft.world.entity.EquipmentSlot.MAINHAND || slot == net.minecraft.world.entity.EquipmentSlot.OFFHAND) { +- return ((Mob) this.entity.getHandle()).handDropChances[slot.getIndex()]; +- } else { +- return ((Mob) this.entity.getHandle()).armorDropChances[slot.getIndex()]; +- } ++ return ((Mob) this.entity.getHandle()).getEquipmentDropChance(slot); // Paper - use getter on Mob + } + } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java