Skip to content

Fixes armor change NoClassDefFound error on Spigot #7774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sovdeeth merged 2 commits into from
Apr 7, 2025
Merged

Fixes armor change NoClassDefFound error on Spigot #7774

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0114a57
Cleanup + fix NCDF on Spigot
sovdeeth Apr 5, 2025
3854294
Merge branch 'dev/feature' into fix/ncdf-armor-spigot
sovdeeth Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 29 additions & 24 deletions src/main/java/ch/njol/skript/events/EvtPlayerArmorChange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,19 @@
import ch.njol.skript.util.Utils;
import ch.njol.skript.util.slot.Slot;
import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent;
import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent.SlotType;
import org.bukkit.event.Event;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.lang.converter.Converter;

import java.util.concurrent.CompletionException;
import java.util.Map;

public class EvtPlayerArmorChange extends SkriptEvent {

private static boolean BODY_SLOT_EXISTS;
private static final boolean BODY_SLOT_EXISTS = Skript.fieldExists(EquipmentSlot.class, "BODY");
private static Converter<PlayerArmorChangeEvent, EquipmentSlot> GET_SLOT;

static {
if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerArmorChangeEvent")) {
Expand All @@ -36,22 +39,30 @@ public class EvtPlayerArmorChange extends SkriptEvent {
)
.since("2.5, 2.11 (equipment slots)");

EquipmentSlot bodySlot = null;
try {
bodySlot = EquipmentSlot.valueOf("BODY");
} catch (IllegalArgumentException | NoSuchFieldError | CompletionException ignored) {};
BODY_SLOT_EXISTS = bodySlot != null;
// get slot function is dependent on version. 1.21.4+ has a new method.
if (Skript.methodExists(PlayerArmorChangeEvent.class, "getSlot")) {
GET_SLOT = PlayerArmorChangeEvent::getSlot;
} else {
//noinspection deprecation
Map<SlotType, EquipmentSlot> slotTypeMap = Map.of(
Enum.valueOf(SlotType.class, "HEAD"), EquipmentSlot.HEAD,
Enum.valueOf(SlotType.class, "CHEST"), EquipmentSlot.CHEST,
Enum.valueOf(SlotType.class, "LEGS"), EquipmentSlot.LEGS,
Enum.valueOf(SlotType.class, "FEET"), EquipmentSlot.FEET);
GET_SLOT = event -> {
//noinspection deprecation
return slotTypeMap.get(event.getSlotType());
};
}

EventValues.registerEventValue(PlayerArmorChangeEvent.class, EquipmentSlot.class,
event -> switch (event.getSlotType()) {
case HEAD -> EquipmentSlot.HEAD;
case CHEST -> EquipmentSlot.CHEST;
case LEGS -> EquipmentSlot.LEGS;
case FEET -> EquipmentSlot.FEET;
});
EventValues.registerEventValue(PlayerArmorChangeEvent.class, ItemStack.class, PlayerArmorChangeEvent::getOldItem, EventValues.TIME_PAST);
EventValues.registerEventValue(PlayerArmorChangeEvent.class, ItemStack.class, PlayerArmorChangeEvent::getNewItem, EventValues.TIME_FUTURE);
EventValues.registerEventValue(PlayerArmorChangeEvent.class, Slot.class, event -> new ch.njol.skript.util.slot.EquipmentSlot(event.getPlayer().getEquipment(), event.getSlot()));
// Register event values
EventValues.registerEventValue(PlayerArmorChangeEvent.class, EquipmentSlot.class, GET_SLOT);
EventValues.registerEventValue(PlayerArmorChangeEvent.class, ItemStack.class,
PlayerArmorChangeEvent::getOldItem, EventValues.TIME_PAST);
EventValues.registerEventValue(PlayerArmorChangeEvent.class, ItemStack.class,
PlayerArmorChangeEvent::getNewItem, EventValues.TIME_FUTURE);
EventValues.registerEventValue(PlayerArmorChangeEvent.class, Slot.class,
event -> new ch.njol.skript.util.slot.EquipmentSlot(event.getPlayer().getEquipment(), event.getSlot()));
}
}

Expand All @@ -76,13 +87,7 @@ public boolean check(Event event) {
PlayerArmorChangeEvent changeEvent = (PlayerArmorChangeEvent) event;
if (slot == null)
return true;
EquipmentSlot changedSlot = switch (changeEvent.getSlotType()) {
case HEAD -> EquipmentSlot.HEAD;
case CHEST -> EquipmentSlot.CHEST;
case LEGS -> EquipmentSlot.LEGS;
case FEET -> EquipmentSlot.FEET;
};
return slot == changedSlot;
return slot == GET_SLOT.convert(changeEvent);
}

@Override
Expand Down