Skip to content

Commit 5319906

Browse files
committed
Fix old Trigger constructor usages
1 parent b563b1c commit 5319906

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

src/main/java/com/btk5h/skriptmirror/skript/custom/SyntaxParseEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static <T extends CustomSyntaxSection.SyntaxData> void register(CustomSyn
6262

6363
whichInfo.forEach(which ->
6464
parserHandlers.put(which,
65-
new Trigger(SkriptUtil.getCurrentScriptFile(), "parse " + which.getPattern(), section, items)));
65+
new Trigger(ParserInstance.get().getCurrentScript(), "parse " + which.getPattern(), section, items)));
6666
}
6767

6868
}

src/main/java/com/btk5h/skriptmirror/skript/custom/condition/CustomConditionSection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ protected boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.Parse
180180
getParser().setCurrentEvent("custom condition check", ConditionCheckEvent.class);
181181
List<TriggerItem> items = SkriptUtil.getItemsFromNode(sectionNode);
182182
whichInfo.forEach(which -> conditionHandlers.put(which,
183-
new Trigger(SkriptUtil.getCurrentScriptFile(), "condition " + which, this, items)));
183+
new Trigger(getParser().getCurrentScript(), "condition " + which, this, items)));
184184
}
185185
SkriptLogger.setNode(null);
186186
}

src/main/java/com/btk5h/skriptmirror/skript/custom/effect/CustomEffectSection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ protected boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.Parse
159159
List<TriggerItem> items = SkriptUtil.getItemsFromNode(sectionNode);
160160
whichInfo.forEach(which ->
161161
effectHandlers.put(which,
162-
new Trigger(SkriptUtil.getCurrentScriptFile(), "effect " + which, this, items)));
162+
new Trigger(getParser().getCurrentScript(), "effect " + which, this, items)));
163163
}
164164
SkriptLogger.setNode(null);
165165
}

src/main/java/com/btk5h/skriptmirror/skript/custom/event/CustomEventSection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ protected boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.Parse
187187
CustomEvent.setLastWhich(null);
188188
whichInfo.forEach(which ->
189189
eventHandlers.put(which,
190-
new Trigger(SkriptUtil.getCurrentScriptFile(), "event " + which, this, items)));
190+
new Trigger(getParser().getCurrentScript(), "event " + which, this, items)));
191191
}
192192
SkriptLogger.setNode(null);
193193
}

src/main/java/com/btk5h/skriptmirror/skript/custom/expression/CustomConstantSection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.Parse
6565
getParser().setCurrentEvent("custom constant getter", ConstantGetEvent.class);
6666
List<TriggerItem> items = SkriptUtil.getItemsFromNode(sectionNode);
6767
Trigger getter =
68-
new Trigger(SkriptUtil.getCurrentScriptFile(), "get {@" + what + "}", this, items);
68+
new Trigger(getParser().getCurrentScript(), "get {@" + what + "}", this, items);
6969

7070
computeOption(what, getter);
7171

src/main/java/com/btk5h/skriptmirror/skript/custom/expression/CustomExpressionSection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ protected boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.Parse
267267
List<TriggerItem> items = SkriptUtil.getItemsFromNode(sectionNode);
268268
whichInfo.forEach(which ->
269269
expressionHandlers.put(which,
270-
new Trigger(SkriptUtil.getCurrentScriptFile(), "get " + which.getPattern(), this, items)));
270+
new Trigger(getParser().getCurrentScript(), "get " + which.getPattern(), this, items)));
271271
}
272272

273273
for (Node subNode : node) {
@@ -288,7 +288,7 @@ protected boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.Parse
288288
changerHandlers.computeIfAbsent(which, k -> new HashMap<>());
289289

290290
changerMap.put(mode,
291-
new Trigger(SkriptUtil.getCurrentScriptFile(),
291+
new Trigger(getParser().getCurrentScript(),
292292
String.format("%s %s", name, which.getPattern()), this, items));
293293
});
294294
}

0 commit comments

Comments
 (0)