geforkt von Mirrors/Paper
ef0e5a642d
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
49 Zeilen
2.4 KiB
Diff
49 Zeilen
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
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
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
|
|
index cb704cef3845727c465fe3ea7210a11545da56c8..6827979a5b270ced53b46ecb9eff548727dadb81 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
|
|
@@ -244,6 +244,17 @@ public class CraftEntityEquipment implements EntityEquipment {
|
|
public void setBootsDropChance(float chance) {
|
|
this.setDropChance(net.minecraft.world.entity.EquipmentSlot.FEET, chance);
|
|
}
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public float getDropChance(EquipmentSlot slot) {
|
|
+ return getDropChance(CraftEquipmentSlot.getNMS(slot));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setDropChance(EquipmentSlot slot, float chance) {
|
|
+ setDropChance(CraftEquipmentSlot.getNMS(slot), chance);
|
|
+ }
|
|
+ // Paper end
|
|
|
|
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");
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
index 8bca88f7b7d310b29bdc851125e4cd03718a4fb9..d6a228473ca6f425757683a4b17b035a53ab117f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
@@ -354,4 +354,15 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
|
|
public void setBootsDropChance(float chance) {
|
|
throw new UnsupportedOperationException("Cannot set drop chance for PlayerInventory");
|
|
}
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public float getDropChance(EquipmentSlot slot) {
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setDropChance(EquipmentSlot slot, float chance) {
|
|
+ throw new UnsupportedOperationException("Cannot set drop chance for PlayerInventory");
|
|
+ }
|
|
+ // Paper end
|
|
}
|