Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-26 18:19:10 +00:00
Code Issues Releases 1 Activity

fix: NMS exceptions being thrown when applying modifiers

Browse Source 
Spigot's validation for this is like my hoover: it sucks.
This commit is contained in:
William
2024-06-22 18:07:53 +01:00
parent d4e33aa9d2
commit 0c527202e5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
View File

@@ -625,7 +625,7 @@ public abstract class BukkitData implements Data {
@Nullable
private static UUID getModifierId(@NotNull AttributeModifier modifier) {
try {
return UUID.fromString(modifier.getName());
return modifier.getUniqueId();
} catch (Throwable e) {
return null;
}
@@ -656,10 +656,12 @@ public abstract class BukkitData implements Data {
// Reflexively create a modern keyed attribute modifier instance. Remove in favor of API long-term.
final EquipmentSlot slot = slotId != -1 ? EquipmentSlot.values()[slotId] : null;
final Class<?> slotGroup = Class.forName(EQUIPMENT_SLOT_GROUP);
final String modifierName = modifier.name() == null ? modifier.uuid().toString() : modifier.name();
return AttributeModifier.class.getDeclaredConstructor(
NamespacedKey.class, double.class, AttributeModifier.Operation.class, slotGroup
).newInstance(
NamespacedKey.fromString(modifier.name()), modifier.amount(),
NamespacedKey.fromString(modifierName),
modifier.amount(),
AttributeModifier.Operation.values()[modifier.operationType()],
slot == null ? slotGroup.getField(EQUIPMENT_SLOT_GROUP$ANY).get(null)
: EquipmentSlot.class.getDeclaredMethod(EQUIPMENT_SLOT$getGroup).invoke(slot)