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

Jump to bottom

Add SkriptEvent getter to ScriptLoader #3766

Merged
merged 2 commits into from Mar 3, 2021
Merged

Add SkriptEvent getter to ScriptLoader #3766

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9680b46
Update ScriptLoader.java
TPGamesNL Feb 21, 2021
b8df15f
Merge branch 'master' into feature/save-skriptevent
FranKusmiruk Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/main/java/ch/njol/skript/ScriptLoader.java
View file
Open in desktop
Expand Up @@ -148,6 +148,22 @@ public static void deleteCurrentEvent() {
hasDelayBefore = Kleenean.FALSE;
}

@Nullable
private static SkriptEvent currentSkriptEvent;

public static void setCurrentSkriptEvent(SkriptEvent skriptEvent) {
currentSkriptEvent = skriptEvent;
}

@Nullable
public static SkriptEvent getCurrentSkriptEvent() {
return currentSkriptEvent;
}

public static void deleteCurrentSkriptEvent() {
currentSkriptEvent = null;
}

public static List<TriggerSection> currentSections = new ArrayList<>();
public static List<Loop> currentLoops = new ArrayList<>();
final static HashMap<String, String> currentOptions = new HashMap<>();
Expand Down Expand Up @@ -675,9 +691,11 @@ public String run(final Matcher m) {

try {
setCurrentEvent("" + parsedEvent.getFirst().getName().toLowerCase(Locale.ENGLISH), parsedEvent.getFirst().events);
setCurrentSkriptEvent(parsedEvent.getSecond());
events.add(new ParsedEventData(parsedEvent, event, node, loadItems(node)));
} finally {
deleteCurrentEvent();
deleteCurrentSkriptEvent();
}

if (parsedEvent.getSecond() instanceof SelfRegisteringSkriptEvent) {
Expand Down Expand Up @@ -723,6 +741,7 @@ public String run(final Matcher m) {

for (ParsedEventData event : events) {
setCurrentEvent("" + event.info.getFirst().getName().toLowerCase(Locale.ENGLISH), event.info.getFirst().events);
setCurrentSkriptEvent(event.info.getSecond());

final Trigger trigger;
try {
Expand All @@ -741,6 +760,7 @@ public String run(final Matcher m) {
}

deleteCurrentEvent();
deleteCurrentSkriptEvent();
}

// Remove the script from the disabled scripts list
Expand Down