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.

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

🚀 Add loop-counter & Improve loops #4595

Merged
merged 46 commits into from
Jun 26, 2023
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
01fbfe0
🚀 Add `fails at` to while loop
AyhamAl-Ali Feb 11, 2022
d3397f3
Add iteration counter expr
AyhamAl-Ali Feb 12, 2022
5534c34
Merge branch 'master' into ench/while-fails-at
AyhamAl-Ali Feb 13, 2022
6ff2f24
🚀 Add loop-counter
AyhamAl-Ali Mar 30, 2022
691e37c
Extra protection
AyhamAl-Ali Mar 30, 2022
1c44447
Merge branch 'master' into ench/while-fails-at
AyhamAl-Ali Mar 30, 2022
72f4164
Should be ready now
AyhamAl-Ali Apr 5, 2022
6f9068c
Merge branch 'master' into ench/while-fails-at
AyhamAl-Ali Apr 5, 2022
d2314fd
Merge branch 'master' into ench/while-fails-at
AyhamAl-Ali Jun 24, 2022
58ccb26
Update src/main/java/ch/njol/skript/expressions/ExprLoopValue.java
AyhamAl-Ali Jul 1, 2022
56c5b68
Merge branch 'master' into ench/while-fails-at
AyhamAl-Ali Jul 1, 2022
674e7c2
RC - Update EffContinue with new LoopSection & Update loop-value
AyhamAl-Ali Jul 1, 2022
66244af
Update description
AyhamAl-Ali Jul 1, 2022
174fb7d
Merge branch 'master' into ench/while-fails-at
AyhamAl-Ali Jul 1, 2022
7ec6b41
Update src/main/java/ch/njol/skript/effects/EffContinue.java
AyhamAl-Ali Jul 1, 2022
4932f49
Merge branch 'master' into ench/while-fails-at
AyhamAl-Ali Jul 1, 2022
75e8f92
Improvements
AyhamAl-Ali Jul 1, 2022
14c8cb6
Merge remote-tracking branch 'AyhamAl-Ali/ench/while-fails-at' into e…
AyhamAl-Ali Jul 1, 2022
d3e3d6d
Annotations
AyhamAl-Ali Jul 1, 2022
cad44b3
Update src/main/java/ch/njol/skript/expressions/ExprLoopIteration.java
AyhamAl-Ali Jul 9, 2022
4161e68
Update src/main/java/ch/njol/skript/expressions/ExprLoopIteration.java
AyhamAl-Ali Jul 15, 2022
d7816d3
Update src/main/java/ch/njol/skript/expressions/ExprLoopIteration.java
AyhamAl-Ali Jul 18, 2022
85f1775
Update error message
AyhamAl-Ali Jul 18, 2022
f5e2a4c
Merge remote-tracking branch 'AyhamAl-Ali/ench/while-fails-at' into e…
AyhamAl-Ali Jul 18, 2022
8cd9c34
Update src/main/java/ch/njol/skript/expressions/ExprLoopIteration.java
AyhamAl-Ali Jul 22, 2022
875cb15
Update src/main/java/ch/njol/skript/lang/LoopSection.java
AyhamAl-Ali Aug 6, 2022
7c1e5b6
Update src/main/java/ch/njol/skript/expressions/ExprLoopValue.java
AyhamAl-Ali Aug 6, 2022
a71f19e
Update src/main/java/ch/njol/skript/sections/SecLoop.java
AyhamAl-Ali Aug 7, 2022
d43da59
Update src/main/java/ch/njol/skript/sections/SecLoop.java
AyhamAl-Ali Aug 7, 2022
a3e111d
Update src/main/java/ch/njol/skript/expressions/ExprLoopIteration.java
AyhamAl-Ali Aug 7, 2022
c98a4f3
Apply suggestions from code review
AyhamAl-Ali Aug 7, 2022
8d4c2e0
Formatting Improvements
AyhamAl-Ali Aug 26, 2022
a32d070
Update src/main/java/ch/njol/skript/effects/EffContinue.java
AyhamAl-Ali Nov 25, 2022
92cde7b
Better variable naming
AyhamAl-Ali Jan 1, 2023
1623b9d
Merge remote-tracking branch 'AyhamAl-Ali/ench/while-fails-at' into e…
AyhamAl-Ali Jan 1, 2023
60e31ba
Examples formatting
AyhamAl-Ali Jan 1, 2023
f7f7329
Requested Changes
AyhamAl-Ali Apr 18, 2023
9bf0f77
Add tests
AyhamAl-Ali Apr 18, 2023
c8c5ed3
Merge remote-tracking branch 'origin/master' into ench/while-fails-at
AyhamAl-Ali Apr 18, 2023
17c4ca5
Apply suggestions from code review
AyhamAl-Ali Apr 19, 2023
ab32194
Reorder methods
AyhamAl-Ali Apr 19, 2023
511d89b
Merge remote-tracking branch 'AyhamAl-Ali/ench/while-fails-at' into e…
AyhamAl-Ali Apr 19, 2023
8d609c2
Update src/test/skript/tests/regressions/4595-loop-iteration.sk
AyhamAl-Ali Apr 20, 2023
08351d2
Merge branch 'master' into ench/while-fails-at
TheLimeGlass Jun 6, 2023
48862ac
Merge branch 'master' into ench/while-fails-at
TheLimeGlass Jun 25, 2023
128bdc8
Merge branch 'master' into ench/while-fails-at
TheLimeGlass Jun 26, 2023
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
Prev Previous commit
Next Next commit
Update src/main/java/ch/njol/skript/sections/SecLoop.java
Co-authored-by: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com>
  • Loading branch information
AyhamAl-Ali and TheLimeGlass authored Aug 7, 2022
commit a71f19e735864bb0746792770374134ffc68f28a
8 changes: 4 additions & 4 deletions src/main/java/ch/njol/skript/sections/SecLoop.java
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ public TriggerItem getActualNext() {
}

@Override
public void exit(Event e) {
current.remove(e);
currentIter.remove(e);
currentLoopCounter.remove(e);
public void exit(Event event) {
current.remove(event);
currentIter.remove(event);
currentLoopCounter.remove(event);
}

@Override
Expand Down