From 918b7105f9e16e2219752ed66bc0b2df10d3fa3e Mon Sep 17 00:00:00 2001 From: Ajneb97 Date: Sun, 11 Aug 2024 12:03:03 -0400 Subject: [PATCH] 1.12.3 --- src/main/java/pk/ajneb97/PlayerKits2.java | 1 + .../pk/ajneb97/managers/KitItemManager.java | 23 +++++++++++++------ src/main/java/pk/ajneb97/utils/ItemUtils.java | 5 ++++ src/main/resources/plugin.yml | 2 +- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/main/java/pk/ajneb97/PlayerKits2.java b/src/main/java/pk/ajneb97/PlayerKits2.java index 5c24914..b39de7a 100644 --- a/src/main/java/pk/ajneb97/PlayerKits2.java +++ b/src/main/java/pk/ajneb97/PlayerKits2.java @@ -125,6 +125,7 @@ public class PlayerKits2 extends JavaPlugin { serverVersion = ServerVersion.v1_20_R4; break; case "1.21": + case "1.21.1": serverVersion = ServerVersion.v1_21_R1; break; default: diff --git a/src/main/java/pk/ajneb97/managers/KitItemManager.java b/src/main/java/pk/ajneb97/managers/KitItemManager.java index 22073f4..48b1a25 100644 --- a/src/main/java/pk/ajneb97/managers/KitItemManager.java +++ b/src/main/java/pk/ajneb97/managers/KitItemManager.java @@ -170,13 +170,6 @@ public class KitItemManager { } } - List flags = kitItem.getFlags(); - if(flags != null) { - for(int i=0;i flags = kitItem.getFlags(); + if(flags != null) { + for(String flag : flags) { + if (flag.equals("HIDE_ATTRIBUTES") && plugin.getDependencyManager().isPaper() && + serverVersion.serverVersionGreaterEqualThan(serverVersion, ServerVersion.v1_21_R1)) { + //Fix PAPER HIDE_ATTRIBUTES + ItemUtils.addDummyAttribute(meta); + } + meta.addItemFlags(ItemFlag.valueOf(flag)); + } + } + item.setItemMeta(meta); + if(!serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R4)){ List nbtList = kitItem.getNbt(); item = ItemUtils.setNBT(plugin,item, nbtList); diff --git a/src/main/java/pk/ajneb97/utils/ItemUtils.java b/src/main/java/pk/ajneb97/utils/ItemUtils.java index 2f9da60..934f623 100644 --- a/src/main/java/pk/ajneb97/utils/ItemUtils.java +++ b/src/main/java/pk/ajneb97/utils/ItemUtils.java @@ -565,6 +565,11 @@ public class ItemUtils { } return item; } + + public static void addDummyAttribute(ItemMeta meta){ + AttributeModifier modifier = new AttributeModifier(UUID.randomUUID(),"",0,AttributeModifier.Operation.ADD_NUMBER,EquipmentSlot.FEET); + meta.addAttributeModifier(Attribute.GENERIC_GRAVITY, modifier); + } public static KitItemBookData getBookData(ItemStack item){ KitItemBookData bookData = null; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 05ecda1..c96e73b 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ main: pk.ajneb97.PlayerKits2 -version: 1.12.2 +version: 1.12.3 name: PlayerKits2 api-version: 1.13 softdepend: [Vault,PlaceholderAPI]