-
-
Notifications
You must be signed in to change notification settings - Fork 390
Housekeeping: remove unneeded legacy version checks & clean up code. #6676
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
Draft
Moderocky
wants to merge
8
commits into
dev/feature
Choose a base branch
from
remove-legacy-code
base: dev/feature
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+192
−387
Draft
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f491ec2
Remove 1.13 method/version checks from conditions. (#6674)
Moderocky 870f312
Remove 1.13 version checks from effects. (#6675)
Moderocky b2874ab
Remove redundant exists checks in some expressions (#6691)
cheeezburga 8bf84ca
Merge branch 'dev/feature' into remove-legacy-code
Moderocky 06d75e0
Removed some redundant exists checks and formatting stuff (#6696)
cheeezburga 937ead0
Removed PassengerUtils class and replaced methods in referencing clas…
cheeezburga 7ab9192
Merge conflicts
cheeezburga 261d41b
Merge branch 'dev/feature' into remove-legacy-code
cheeezburga File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Submodule skript-aliases
updated
9 files
+1 −1 | README.md | |
+0 −389 | armor-trims.sk | |
+149 −1 | building.sk | |
+390 −0 | combat.sk | |
+0 −19 | doors.sk | |
+18 −0 | redstone.sk | |
+0 −82 | slabs.sk | |
+0 −70 | stairs.sk | |
+1 −1 | transportation.sk |
105 changes: 0 additions & 105 deletions
105
src/main/java/ch/njol/skript/bukkitutil/PassengerUtils.java
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,12 +42,10 @@ | |
public class CondIgnitionProcess extends PropertyCondition<LivingEntity> { | ||
|
||
static { | ||
if (Skript.methodExists(Creeper.class, "isIgnited")) { | ||
Skript.registerCondition(CondIgnitionProcess.class, | ||
"[creeper[s]] %livingentities% ((is|are)|1¦(isn't|is not|aren't|are not)) going to explode", | ||
"[creeper[s]] %livingentities% ((is|are)|1¦(isn't|is not|aren't|are not)) in the (ignition|explosion) process", | ||
"creeper[s] %livingentities% ((is|are)|1¦(isn't|is not|aren't|are not)) ignited"); | ||
} | ||
Skript.registerCondition(CondIgnitionProcess.class, | ||
"[creeper[s]] %livingentities% ((is|are)|1¦(isn't|is not|aren't|are not)) going to explode", | ||
"[creeper[s]] %livingentities% ((is|are)|1¦(isn't|is not|aren't|are not)) in the (ignition|explosion) process", | ||
"creeper[s] %livingentities% ((is|are)|1¦(isn't|is not|aren't|are not)) ignited"); | ||
Comment on lines
-45
to
+48
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This as well. |
||
} | ||
|
||
@SuppressWarnings({"unchecked", "null"}) | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't this still require the check? I can't see the Player#hasResourcePack() in Spigot 1.13.2.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Based on the fact
@RequiredPlugins
state "Paper 1.9 or newer" it is possible. As such I did go and check latest spigot releases and there's no method forhasResourcePack
so this check should still remainThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes this was only on the list for documentation update