mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 19:15:32 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From 1b2a490f9d808c712e3e9d4f77e8e343a7272a85 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.21.0
|
|
|