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

Feature/pathfinding to be double #4915

Merged
merged 20 commits into from
Jul 18, 2022
Merged

Feature/pathfinding to be double #4915

Changes from 18 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0a57fd4
Add EffPathfind
Pikachu920 Mar 17, 2022
41a7a2f
Remove redundant parentheses
Pikachu920 Mar 17, 2022
7cfcc3f
Add additional examples to EffPathfind
Pikachu920 Mar 17, 2022
f63e92c
Fix copied documentation
Pikachu920 Mar 17, 2022
1917475
Add class existence check to EffPathFind registration
Pikachu920 Mar 17, 2022
b1f728a
Merge branch 'master' into feature/pathfinding
TheLimeGlass Jun 30, 2022
bbd8430
Update src/main/java/ch/njol/skript/effects/EffPathfind.java
AyhamAl-Ali Jun 30, 2022
c42f79f
Merge branch 'master' into feature/pathfinding
TheLimeGlass Jul 12, 2022
dcd608d
Apply changes
TheLimeGlass Jul 16, 2022
b146620
Merge branch 'master' into feature/pathfinding
TheLimeGlass Jul 16, 2022
89f901a
Make pathfind a double
TheLimeGlass Jul 16, 2022
b809e9a
Merge branch 'feature/pathfinding' of https://github.com/SkriptLang/S…
TheLimeGlass Jul 16, 2022
63fb54d
Merge branch 'master' into feature/pathfinding
TheLimeGlass Jul 16, 2022
3d43b21
Clean up documentation
TheLimeGlass Jul 17, 2022
c5496d2
Merge branch 'feature/pathfinding' of https://github.com/SkriptLang/S…
TheLimeGlass Jul 17, 2022
f7fc4dc
Add required plugin annotation
TheLimeGlass Jul 18, 2022
8780e13
Add required plugin annotation
TheLimeGlass Jul 18, 2022
5d61527
Add required plugin annotation
TheLimeGlass Jul 18, 2022
e2ca150
Add required plugin annotation
TheLimeGlass Jul 18, 2022
b1e2f39
Merge branch 'master' into feature/pathfinding
TheLimeGlass Jul 18, 2022
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
15 changes: 8 additions & 7 deletions src/main/java/ch/njol/skript/effects/EffPathfind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import ch.njol.skript.doc.Description;
import ch.njol.skript.doc.Examples;
import ch.njol.skript.doc.Name;
import ch.njol.skript.doc.RequiredPlugins;
import ch.njol.skript.doc.Since;
import ch.njol.skript.lang.Effect;
import ch.njol.skript.lang.Expression;
Expand All @@ -40,9 +41,10 @@
@Examples({
"make all creepers pathfind towards player",
"make all cows stop pathfinding",
"make event-entity pathfind towards player"
"make event-entity pathfind towards player at speed 1"
})
@Since("INSERT VERSION")
@RequiredPlugins("Paper 1.13+")
public class EffPathfind extends Effect {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you're editing, the check at L49 is no longer needed since it's 1.13+

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a Paper Spigot exclusive effect.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then that class needs @RequiredPlugins annotation instead of the description note


static {
Expand Down Expand Up @@ -72,7 +74,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
@Override
protected void execute(Event event) {
Object target = this.target != null ? this.target.getSingle(event) : null;
int speed = this.speed != null ? this.speed.getSingle(event).intValue() : 1;
double speed = this.speed != null ? this.speed.getOptionalSingle(event).orElse(1).doubleValue() : 1;
for (LivingEntity entity : entities.getArray(event)) {
if (!(entity instanceof Mob))
continue;
Expand All @@ -87,13 +89,12 @@ protected void execute(Event event) {
}

@Override
public String toString(@Nullable Event e, boolean debug) {
public String toString(@Nullable Event event, boolean debug) {
if (target == null)
return "make " + entities.toString(e, debug) + " stop pathfinding";

String repr = "make " + entities.toString(e, debug) + " pathfind towards " + target.toString(e, debug);
return "make " + entities.toString(event, debug) + " stop pathfinding";
String repr = "make " + entities.toString(event, debug) + " pathfind towards " + target.toString(event, debug);
if (speed != null)
repr += " at speed " + speed.toString(e, debug);
repr += " at speed " + speed.toString(event, debug);
return repr;
}

Expand Down