2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: pkt77 <parkerkt77@gmail.com>
|
|
|
|
Date: Fri, 10 Nov 2017 23:46:34 -0500
|
|
|
|
Subject: [PATCH] Add PlayerArmorChangeEvent
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2024-04-12 21:14:06 +02:00
|
|
|
index 589fba7264d8041e6f766779fe8e3d5071398fed..96805bc64fd3593373ba9eecf29bd13d33d9e053 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
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:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
@@ -3068,6 +3068,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2021-06-11 14:02:28 +02:00
|
|
|
ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
|
|
|
|
|
2022-12-07 19:52:24 +01:00
|
|
|
if (this.equipmentHasChanged(itemstack, itemstack1)) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper start - PlayerArmorChangeEvent
|
|
|
|
+ if (this instanceof ServerPlayer && enumitemslot.getType() == EquipmentSlot.Type.ARMOR) {
|
|
|
|
+ final org.bukkit.inventory.ItemStack oldItem = CraftItemStack.asBukkitCopy(itemstack);
|
|
|
|
+ final org.bukkit.inventory.ItemStack newItem = CraftItemStack.asBukkitCopy(itemstack1);
|
2024-02-01 10:15:57 +01:00
|
|
|
+ new com.destroystokyo.paper.event.player.PlayerArmorChangeEvent((Player) this.getBukkitEntity(), com.destroystokyo.paper.event.player.PlayerArmorChangeEvent.SlotType.valueOf(enumitemslot.name()), oldItem, newItem).callEvent();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
2024-01-22 18:04:55 +01:00
|
|
|
+ // Paper end - PlayerArmorChangeEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
if (map == null) {
|
|
|
|
map = Maps.newEnumMap(EquipmentSlot.class);
|
|
|
|
}
|
2023-09-25 01:05:05 +02:00
|
|
|
diff --git a/src/test/java/io/papermc/paper/inventory/item/ArmorSlotTypeMaterialTest.java b/src/test/java/io/papermc/paper/inventory/item/ArmorSlotTypeMaterialTest.java
|
2023-07-13 22:09:26 +02:00
|
|
|
new file mode 100644
|
2023-09-25 01:05:05 +02:00
|
|
|
index 0000000000000000000000000000000000000000..a706dcbabfe31bf54a552965fa5feb8be34213bf
|
2023-07-13 22:09:26 +02:00
|
|
|
--- /dev/null
|
2023-09-25 01:05:05 +02:00
|
|
|
+++ b/src/test/java/io/papermc/paper/inventory/item/ArmorSlotTypeMaterialTest.java
|
|
|
|
@@ -0,0 +1,74 @@
|
2023-07-13 22:09:26 +02:00
|
|
|
+package io.papermc.paper.inventory.item;
|
|
|
|
+
|
|
|
|
+import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent;
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.List;
|
2023-09-24 09:16:58 +02:00
|
|
|
+import java.util.stream.Stream;
|
2023-07-13 22:09:26 +02:00
|
|
|
+import net.minecraft.world.entity.EquipmentSlot;
|
|
|
|
+import net.minecraft.world.item.Equipable;
|
|
|
|
+import net.minecraft.world.item.Item;
|
|
|
|
+import net.minecraft.world.item.ItemStack;
|
|
|
|
+import org.bukkit.Material;
|
|
|
|
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
|
|
|
|
+import org.bukkit.support.AbstractTestingBase;
|
2023-09-24 09:16:58 +02:00
|
|
|
+import org.junit.jupiter.params.ParameterizedTest;
|
|
|
|
+import org.junit.jupiter.params.provider.MethodSource;
|
2023-07-13 22:09:26 +02:00
|
|
|
+
|
2023-09-24 09:16:58 +02:00
|
|
|
+import static org.junit.jupiter.api.Assertions.assertEquals;
|
|
|
|
+import static org.junit.jupiter.api.Assertions.assertNotNull;
|
2023-09-25 01:05:05 +02:00
|
|
|
+import static org.junit.jupiter.api.Assertions.assertTrue;
|
2023-07-13 22:09:26 +02:00
|
|
|
+
|
2023-09-25 01:05:05 +02:00
|
|
|
+public class ArmorSlotTypeMaterialTest extends AbstractTestingBase {
|
2023-07-13 22:09:26 +02:00
|
|
|
+
|
2023-09-25 01:05:05 +02:00
|
|
|
+ public static Stream<Object[]> slotTypeParams() {
|
2023-07-13 22:09:26 +02:00
|
|
|
+ final List<Object[]> parameters = new ArrayList<>();
|
|
|
|
+ for (final PlayerArmorChangeEvent.SlotType slotType : PlayerArmorChangeEvent.SlotType.values()) {
|
|
|
|
+ for (final Material item : slotType.getTypes()) {
|
|
|
|
+ parameters.add(new Object[]{ slotType, item });
|
|
|
|
+ }
|
|
|
|
+ }
|
2023-09-24 09:16:58 +02:00
|
|
|
+ return parameters.stream();
|
2023-07-13 22:09:26 +02:00
|
|
|
+ }
|
|
|
|
+
|
2023-09-25 01:05:05 +02:00
|
|
|
+ @ParameterizedTest(name = "{argumentsWithNames}")
|
|
|
|
+ @MethodSource("slotTypeParams")
|
|
|
|
+ public void testSlotType(PlayerArmorChangeEvent.SlotType slotType, Material item) {
|
2023-09-24 09:16:58 +02:00
|
|
|
+ final Item nmsItem = CraftMagicNumbers.getItem(item);
|
2023-07-13 22:09:26 +02:00
|
|
|
+ final Equipable equipable = Equipable.get(new ItemStack(nmsItem));
|
2023-09-24 09:16:58 +02:00
|
|
|
+ assertNotNull(equipable, item + " isn't equipable");
|
|
|
|
+ final EquipmentSlot slot = switch (slotType) {
|
2023-07-13 22:09:26 +02:00
|
|
|
+ case HEAD -> EquipmentSlot.HEAD;
|
|
|
|
+ case CHEST -> EquipmentSlot.CHEST;
|
|
|
|
+ case LEGS -> EquipmentSlot.LEGS;
|
|
|
|
+ case FEET -> EquipmentSlot.FEET;
|
|
|
|
+ };
|
2023-09-24 09:16:58 +02:00
|
|
|
+ assertEquals(equipable.getEquipmentSlot(), slot, item + " isn't set to the right slot");
|
2023-07-13 22:09:26 +02:00
|
|
|
+ }
|
|
|
|
+
|
2023-09-25 01:05:05 +02:00
|
|
|
+ public static Stream<Object[]> equipableParams() {
|
2023-07-13 22:09:26 +02:00
|
|
|
+ final List<Object[]> parameters = new ArrayList<>();
|
2023-09-25 01:05:05 +02:00
|
|
|
+ for (final Item item : net.minecraft.core.registries.BuiltInRegistries.ITEM) {
|
2023-07-13 22:09:26 +02:00
|
|
|
+ final Equipable equipable = Equipable.get(new ItemStack(item));
|
|
|
|
+ if (equipable != null) {
|
2023-09-24 09:16:58 +02:00
|
|
|
+ parameters.add(new Object[]{equipable, item});
|
2023-07-13 22:09:26 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
2023-09-24 09:16:58 +02:00
|
|
|
+ return parameters.stream();
|
2023-07-13 22:09:26 +02:00
|
|
|
+ }
|
|
|
|
+
|
2023-09-25 01:05:05 +02:00
|
|
|
+ @ParameterizedTest(name = "{argumentsWithNames}")
|
|
|
|
+ @MethodSource("equipableParams")
|
|
|
|
+ public void testEquipable(Equipable equipable, Item item) {
|
2023-09-24 09:16:58 +02:00
|
|
|
+ final EquipmentSlot equipmentSlot = equipable.getEquipmentSlot();
|
2023-07-13 22:09:26 +02:00
|
|
|
+ PlayerArmorChangeEvent.SlotType slotType = switch (equipmentSlot) {
|
|
|
|
+ case HEAD -> PlayerArmorChangeEvent.SlotType.HEAD;
|
|
|
|
+ case CHEST -> PlayerArmorChangeEvent.SlotType.CHEST;
|
|
|
|
+ case LEGS -> PlayerArmorChangeEvent.SlotType.LEGS;
|
|
|
|
+ case FEET -> PlayerArmorChangeEvent.SlotType.FEET;
|
|
|
|
+ default -> null;
|
|
|
|
+ };
|
|
|
|
+ if (slotType != null) {
|
2023-09-24 09:16:58 +02:00
|
|
|
+ assertTrue(slotType.getTypes().contains(CraftMagicNumbers.getMaterial(item)), "SlotType " + slotType + " doesn't include " + item);
|
2023-07-13 22:09:26 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+}
|