mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
e4d10a6d67
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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From 39325403280c86ba742dfa67100a6d15d5e45d05 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 5873b76236..ef4cd7a7b6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
|
|
@@ -268,4 +268,54 @@ 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 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.25.1
|
|
|