Skip to content

Commit c9d73b1

Browse files
Cooldowns and fixes
1 parent 544dcc1 commit c9d73b1

12 files changed

Lines changed: 584 additions & 306 deletions

File tree

src/main/java/ch/njol/skript/effects/EffCancelCooldown.java

Lines changed: 0 additions & 69 deletions
This file was deleted.

src/main/java/ch/njol/skript/expressions/ExprCmdCooldownInfo.java

Lines changed: 0 additions & 211 deletions
This file was deleted.

src/main/java/org/skriptlang/skript/bukkit/command/CommandModule.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import org.skriptlang.skript.addon.AddonModule;
44
import org.skriptlang.skript.addon.HierarchicalAddonModule;
55
import org.skriptlang.skript.addon.SkriptAddon;
6+
import org.skriptlang.skript.bukkit.command.elements.effects.EffCancelCooldown;
67
import org.skriptlang.skript.bukkit.command.elements.expressions.ExprArgument;
8+
import org.skriptlang.skript.bukkit.command.elements.expressions.ExprCmdCooldownInfo;
79
import org.skriptlang.skript.bukkit.command.elements.structures.StructCommand;
810

911
public class CommandModule extends HierarchicalAddonModule {
@@ -15,7 +17,9 @@ public CommandModule(AddonModule parentModule) {
1517
@Override
1618
protected void loadSelf(SkriptAddon addon) {
1719
register(addon,
20+
EffCancelCooldown::register,
1821
ExprArgument::register,
22+
ExprCmdCooldownInfo::register,
1923
syntaxRegistry -> StructCommand.register(addon, syntaxRegistry)
2024
);
2125
}

src/main/java/org/skriptlang/skript/bukkit/command/brigadier/CommandParsingData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ public final class CommandParsingData extends Data {
2020

2121
private final Deque<ExecutorData> executorDatas = new ArrayDeque<>(4);
2222

23+
public boolean isParsingCooldownEntry = false;
24+
2325
public CommandParsingData(ParserInstance parserInstance) {
2426
super(parserInstance);
2527
}

0 commit comments

Comments
 (0)