Skip to content

Include player as entity in on entity move #7669

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
erenkarakal merged 3 commits into from
Mar 31, 2025
Merged

Include player as entity in on entity move #7669

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eafab9d
include player as entity in on entity move
sovdeeth Mar 2, 2025
3511006
Merge branch 'dev/patch' into fix/entity-player-move
Efnilite Mar 22, 2025
291143f
Merge branch 'dev/patch' into fix/entity-player-move
erenkarakal Mar 31, 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
36 changes: 17 additions & 19 deletions src/main/java/ch/njol/skript/events/EvtMove.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public class EvtMove extends SkriptEvent {

private EntityData<?> entityData;
private boolean isPlayer;
private boolean canBePlayer;
private Move moveType;

private enum Move {
Expand Down Expand Up @@ -73,9 +74,10 @@ public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResu
entityData = ((Literal<EntityData<?>>) args[0]).getSingle();
isPlayer = Player.class.isAssignableFrom(entityData.getType());
if (!HAS_ENTITY_MOVE && !isPlayer) {
Skript.error("Entity move event requires Paper 1.16.5+");
Skript.error("Entity move event requires Paper");
return false;
}
canBePlayer = entityData.getType().isAssignableFrom(Player.class);
if (matchedPattern > 0) {
moveType = Move.MOVE_OR_ROTATE;
} else if (parseResult.hasTag("rotate")) {
Expand All @@ -89,28 +91,22 @@ public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResu
@Override
public boolean check(Event event) {
Location from, to;
if (isPlayer && event instanceof PlayerMoveEvent) {
PlayerMoveEvent playerEvent = (PlayerMoveEvent) event;
from = playerEvent.getFrom();
to = playerEvent.getTo();
} else if (HAS_ENTITY_MOVE && event instanceof EntityMoveEvent) {
EntityMoveEvent entityEvent = (EntityMoveEvent) event;
if (!(entityData.isInstance(entityEvent.getEntity())))
if (canBePlayer && event instanceof PlayerMoveEvent playerMoveEvent) {
from = playerMoveEvent.getFrom();
to = playerMoveEvent.getTo();
} else if (HAS_ENTITY_MOVE && event instanceof EntityMoveEvent entityMoveEvent) {
if (!(entityData.isInstance(entityMoveEvent.getEntity())))
return false;
from = entityEvent.getFrom();
to = entityEvent.getTo();
from = entityMoveEvent.getFrom();
to = entityMoveEvent.getTo();
} else {
return false;
}
switch (moveType) {
case MOVE:
return hasChangedPosition(from, to);
case ROTATE:
return hasChangedOrientation(from, to);
case MOVE_OR_ROTATE:
return true;
}
return false;
return switch (moveType) {
case MOVE -> hasChangedPosition(from, to);
case ROTATE -> hasChangedOrientation(from, to);
case MOVE_OR_ROTATE -> true;
};
}

@Override
Expand All @@ -119,6 +115,8 @@ public boolean check(Event event) {
if (isPlayer) {
return new Class[] {PlayerMoveEvent.class};
} else if (HAS_ENTITY_MOVE) {
if (canBePlayer)
return new Class[] {EntityMoveEvent.class, PlayerMoveEvent.class};
return new Class[] {EntityMoveEvent.class};
}
throw new IllegalStateException("This event has not yet initialized!");
Expand Down