mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 19:37:35 +01:00
b62dfa0bf9
Upstream has released updates that appears 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: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes:1cf8b5dcSPIGOT-4400: Populators running on existing chunks116cb9a1SPIGOT-4399: Add attribute modifier equality test5ee1c18aSPIGOT-4398: Set ASM7_EXPERIMENTAL flag
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From e39ea75f06d5a7f85143686fa4f1ebc0e8964f93 Mon Sep 17 00:00:00 2001
|
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
|
Date: Sun, 20 Mar 2016 06:45:01 -0400
|
|
Subject: [PATCH] Access items by EquipmentSlot
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
index 6cbe069562..7b62f26d7c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
@@ -250,4 +250,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
|
|
public void setBootsDropChance(float chance) {
|
|
throw new UnsupportedOperationException();
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public ItemStack getItem(org.bukkit.inventory.EquipmentSlot slot) {
|
|
+ Preconditions.checkNotNull(slot, "slot");
|
|
+ switch (slot) {
|
|
+ case HAND:
|
|
+ return this.getItemInMainHand();
|
|
+ case OFF_HAND:
|
|
+ return this.getItemInOffHand();
|
|
+ case HEAD:
|
|
+ return this.getHelmet();
|
|
+ case CHEST:
|
|
+ return this.getChestplate();
|
|
+ case LEGS:
|
|
+ return this.getLeggings();
|
|
+ case FEET:
|
|
+ return this.getBoots();
|
|
+ }
|
|
+
|
|
+ throw new UnsupportedOperationException(slot.name());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setItem(org.bukkit.inventory.EquipmentSlot slot, ItemStack stack) {
|
|
+ Preconditions.checkNotNull(slot, "slot");
|
|
+ switch (slot) {
|
|
+ case HAND:
|
|
+ this.setItemInMainHand(stack);
|
|
+ return;
|
|
+ case OFF_HAND:
|
|
+ this.setItemInOffHand(stack);
|
|
+ return;
|
|
+ case HEAD:
|
|
+ this.setHelmet(stack);
|
|
+ return;
|
|
+ case CHEST:
|
|
+ this.setChestplate(stack);
|
|
+ return;
|
|
+ case LEGS:
|
|
+ this.setLeggings(stack);
|
|
+ return;
|
|
+ case FEET:
|
|
+ this.setBoots(stack);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ throw new UnsupportedOperationException(slot.name());
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.19.0
|
|
|