Skip to content
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

Event Values Fix #7599

Open
wants to merge 5 commits into
base: dev/patch
Choose a base branch
from
Open

Event Values Fix #7599

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c74ddc
Initial Commit
TheAbsolutionism Feb 9, 2025
f18bd4a
Add 'event-entity' with 'event-player' in parse test
TheAbsolutionism Feb 10, 2025
7495475
Revert javadocs
TheAbsolutionism Feb 10, 2025
be945d9
Merge remote-tracking branch 'upstream/dev/patch' into dev/EventValueFix
TheAbsolutionism Mar 2, 2025
7bb0790
Requested Changes
TheAbsolutionism Mar 2, 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
2 changes: 2 additions & 0 deletions src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,13 +286,15 @@ public PotionEffectType convert(AreaEffectCloudApplyEvent event) {
EventValues.registerEventValue(PlayerDropItemEvent.class, Player.class, PlayerEvent::getPlayer);
EventValues.registerEventValue(PlayerDropItemEvent.class, Item.class, PlayerDropItemEvent::getItemDrop);
EventValues.registerEventValue(PlayerDropItemEvent.class, ItemStack.class, event -> event.getItemDrop().getItemStack());
EventValues.registerEventValue(PlayerDropItemEvent.class, Entity.class, PlayerEvent::getPlayer);
// EntityDropItemEvent
EventValues.registerEventValue(EntityDropItemEvent.class, Item.class, EntityDropItemEvent::getItemDrop);
EventValues.registerEventValue(EntityDropItemEvent.class, ItemStack.class, event -> event.getItemDrop().getItemStack());
// PlayerPickupItemEvent
EventValues.registerEventValue(PlayerPickupItemEvent.class, Player.class, PlayerEvent::getPlayer);
EventValues.registerEventValue(PlayerPickupItemEvent.class, Item.class, PlayerPickupItemEvent::getItem);
EventValues.registerEventValue(PlayerPickupItemEvent.class, ItemStack.class, event -> event.getItem().getItemStack());
EventValues.registerEventValue(PlayerPickupItemEvent.class, Entity.class, PlayerEvent::getPlayer);
// EntityPickupItemEvent
EventValues.registerEventValue(EntityPickupItemEvent.class, Entity.class, EntityPickupItemEvent::getEntity);
EventValues.registerEventValue(EntityPickupItemEvent.class, Item.class, EntityPickupItemEvent::getItem);
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/ch/njol/skript/expressions/ExprEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,13 @@ public <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
}
return super.getConvertedExpression(to);
}


@Override
public boolean setTime(int time) {
// Allows using 'past' / 'future' event-entitydata if they're registered
return entity.setTime(time);
}

@Override
public String toString(final @Nullable Event e, final boolean debug) {
return "the " + type;
Expand Down
Loading
Loading