Feature/command selectors #298
Draft
Conversation
This file contains 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
Fix markup inconsistencies
Bump bukkit version to 1.13.2
aikar
requested changes
Oct 15, 2020
| //Check if mc version is higher than 1.13.1 (added in 1.13.2) | ||
| if ((manager.mcMinorVersion > 13) || (manager.mcMinorVersion == 13 && manager.mcPatchVersion > 1)) { | ||
| try { | ||
| Entity entity = Bukkit.selectEntities(issuer.getIssuer(), lookup).get(0); |
There was a problem hiding this comment.
rather than blind look up 0 relying on errors, iterate and return on first player match instead, and lack of finding should fall through to the lines below.
And we can only run this selectEntities if the input starts with @
| @@ -241,6 +241,20 @@ OnlinePlayer getOnlinePlayer(BukkitCommandIssuer issuer, String lookup, boolean | |||
| Player player = ACFBukkitUtil.findPlayerSmart(issuer, lookup); | |||
| //noinspection Duplicates | |||
| if (player == null) { | |||
| if (issuer.getManager() instanceof BukkitCommandManager) { | |||
There was a problem hiding this comment.
this is already a bukkit context, this isn't really needed.
this.manager should already exists.
There was a problem hiding this comment.
this.manager returns a CommandManager which does not have the version fields, however, i should probably be able to cast that safely right?
Iterate over the entitylist properly now
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Adds command selector handling to
BukkitCommandContexts#getOnlinePlayerHowever i'm not sure how to deal with @A or selectors that return more than one entity. So in this draft i just return the first entry. However this isn't an optimal solution, and also currently fails if there are no players