mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 22:45:31 +01:00
3e90a19183
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: 304e83eb PR-1002: Improve documentation and implementation of getMaxStackSize e8215ea2 SPIGOT-7638: Library loader does not seem to resolve every dependency 79c595c0 SPIGOT-7637: Bad logic in checking nullability of AttributeModifier slots CraftBukkit Changes: 91b1fc3f1 SPIGOT-7644: Fix ItemMeta#getAsString 4e77a81e1 SPIGOT-7615: PlayerLeashEntityEvent cancelled eats lead 996f660f3 Do not remove leash knot if leasing to an existing leash knot gets cancelled f70367d42 SPIGOT-7643: Fix inverted leash event cancelled usage and remove leash knot if no entity gets leashed 7ddb48294 SPIGOT-7640: Abnormal jumping height of wind charge 080c8711e SPIGOT-7639: Incoming plugin channels not working ad549847e Open a direct connection instead of pinging mojang server to check if it is reachable 38e2926c5 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: SoSeDiK <mrsosedik@gmail.com>
|
|
Date: Sun, 16 Oct 2022 15:28:49 +0300
|
|
Subject: [PATCH] Add EquipmentSlot convenience methods
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/EquipmentSlot.java b/src/main/java/org/bukkit/inventory/EquipmentSlot.java
|
|
index 5642d8af60b6649497aba9b0f6ab7bba7702b9ee..adf0a94f98eb66b3957d4009d83ad5f741e0aa79 100644
|
|
--- a/src/main/java/org/bukkit/inventory/EquipmentSlot.java
|
|
+++ b/src/main/java/org/bukkit/inventory/EquipmentSlot.java
|
|
@@ -33,4 +33,27 @@ public enum EquipmentSlot {
|
|
public EquipmentSlotGroup getGroup() {
|
|
return group.get();
|
|
}
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Checks whether this equipment slot is a hand:
|
|
+ * either {@link #HAND} or {@link #OFF_HAND}
|
|
+ *
|
|
+ * @return whether this is a hand slot
|
|
+ */
|
|
+ public boolean isHand() {
|
|
+ return this == HAND || this == OFF_HAND;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Checks whether this equipment slot
|
|
+ * is one of the armor slots:
|
|
+ * {@link #HEAD}, {@link #CHEST},
|
|
+ * {@link #LEGS}, {@link #FEET}, or {@link #BODY}
|
|
+ *
|
|
+ * @return whether this is an armor slot
|
|
+ */
|
|
+ public boolean isArmor() {
|
|
+ return this == HEAD || this == CHEST || this == LEGS || this == FEET || this == BODY;
|
|
+ }
|
|
+ // Paper end
|
|
}
|