mirror of
https://github.com/aikar/commands.git
synced 2026-05-31 06:11:55 +00:00
(DEPLOYED ACF) Updated JavaDocs
This commit is contained in:
Aikar
@@ -591,7 +591,7 @@ public static @NotNull org.bukkit.Location <a href="../../../src-html/
|
||||
<ul class="blockListLast">
|
||||
<li class="blockList">
|
||||
<h4>isValidName</h4>
|
||||
<pre>public static boolean <a href="../../../src-html/co/aikar/commands/ACFBukkitUtil.html#line.316">isValidName</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
|
||||
<pre>public static boolean <a href="../../../src-html/co/aikar/commands/ACFBukkitUtil.html#line.313">isValidName</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> name)</pre>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
@@ -264,71 +264,68 @@
|
||||
<span class="sourceLineNo">256</span> return null;<a name="line.256"></a>
|
||||
<span class="sourceLineNo">257</span> }<a name="line.257"></a>
|
||||
<span class="sourceLineNo">258</span> String name = ACFUtil.replace(search, ":confirm", "");<a name="line.258"></a>
|
||||
<span class="sourceLineNo">259</span> if (name.length() < 3) {<a name="line.259"></a>
|
||||
<span class="sourceLineNo">260</span> issuer.sendError(MinecraftMessageKeys.USERNAME_TOO_SHORT);<a name="line.260"></a>
|
||||
<span class="sourceLineNo">261</span> return null;<a name="line.261"></a>
|
||||
<span class="sourceLineNo">262</span> }<a name="line.262"></a>
|
||||
<span class="sourceLineNo">263</span> if (!isValidName(name)) {<a name="line.263"></a>
|
||||
<span class="sourceLineNo">264</span> issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);<a name="line.264"></a>
|
||||
<span class="sourceLineNo">265</span> return null;<a name="line.265"></a>
|
||||
<span class="sourceLineNo">266</span> }<a name="line.266"></a>
|
||||
<span class="sourceLineNo">267</span><a name="line.267"></a>
|
||||
<span class="sourceLineNo">268</span> List<Player> matches = Bukkit.getServer().matchPlayer(name);<a name="line.268"></a>
|
||||
<span class="sourceLineNo">269</span> List<Player> confirmList = new ArrayList<>();<a name="line.269"></a>
|
||||
<span class="sourceLineNo">270</span> findMatches(search, requester, matches, confirmList);<a name="line.270"></a>
|
||||
<span class="sourceLineNo">271</span><a name="line.271"></a>
|
||||
<span class="sourceLineNo">272</span><a name="line.272"></a>
|
||||
<span class="sourceLineNo">273</span> if (matches.size() > 1 || confirmList.size() > 1) {<a name="line.273"></a>
|
||||
<span class="sourceLineNo">274</span> String allMatches = matches.stream().map(Player::getName).collect(Collectors.joining(", "));<a name="line.274"></a>
|
||||
<span class="sourceLineNo">275</span> issuer.sendError(MinecraftMessageKeys.MULTIPLE_PLAYERS_MATCH,<a name="line.275"></a>
|
||||
<span class="sourceLineNo">276</span> "{search}", name, "{all}", allMatches);<a name="line.276"></a>
|
||||
<span class="sourceLineNo">277</span> return null;<a name="line.277"></a>
|
||||
<span class="sourceLineNo">278</span> }<a name="line.278"></a>
|
||||
<span class="sourceLineNo">279</span><a name="line.279"></a>
|
||||
<span class="sourceLineNo">280</span> //noinspection Duplicates<a name="line.280"></a>
|
||||
<span class="sourceLineNo">281</span> if (matches.isEmpty()) {<a name="line.281"></a>
|
||||
<span class="sourceLineNo">282</span> if (confirmList.isEmpty()) {<a name="line.282"></a>
|
||||
<span class="sourceLineNo">283</span> issuer.sendError(MinecraftMessageKeys.NO_PLAYER_FOUND_SERVER,<a name="line.283"></a>
|
||||
<span class="sourceLineNo">284</span> "{search}", name);<a name="line.284"></a>
|
||||
<span class="sourceLineNo">285</span> return null;<a name="line.285"></a>
|
||||
<span class="sourceLineNo">286</span> } else {<a name="line.286"></a>
|
||||
<span class="sourceLineNo">287</span> Player player = Iterables.getOnlyElement(confirmList);<a name="line.287"></a>
|
||||
<span class="sourceLineNo">288</span> issuer.sendInfo(MinecraftMessageKeys.PLAYER_IS_VANISHED_CONFIRM, "{vanished}", player.getName());<a name="line.288"></a>
|
||||
<span class="sourceLineNo">289</span> return null;<a name="line.289"></a>
|
||||
<span class="sourceLineNo">290</span> }<a name="line.290"></a>
|
||||
<span class="sourceLineNo">291</span> }<a name="line.291"></a>
|
||||
<span class="sourceLineNo">259</span><a name="line.259"></a>
|
||||
<span class="sourceLineNo">260</span> if (!isValidName(name)) {<a name="line.260"></a>
|
||||
<span class="sourceLineNo">261</span> issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);<a name="line.261"></a>
|
||||
<span class="sourceLineNo">262</span> return null;<a name="line.262"></a>
|
||||
<span class="sourceLineNo">263</span> }<a name="line.263"></a>
|
||||
<span class="sourceLineNo">264</span><a name="line.264"></a>
|
||||
<span class="sourceLineNo">265</span> List<Player> matches = Bukkit.getServer().matchPlayer(name);<a name="line.265"></a>
|
||||
<span class="sourceLineNo">266</span> List<Player> confirmList = new ArrayList<>();<a name="line.266"></a>
|
||||
<span class="sourceLineNo">267</span> findMatches(search, requester, matches, confirmList);<a name="line.267"></a>
|
||||
<span class="sourceLineNo">268</span><a name="line.268"></a>
|
||||
<span class="sourceLineNo">269</span><a name="line.269"></a>
|
||||
<span class="sourceLineNo">270</span> if (matches.size() > 1 || confirmList.size() > 1) {<a name="line.270"></a>
|
||||
<span class="sourceLineNo">271</span> String allMatches = matches.stream().map(Player::getName).collect(Collectors.joining(", "));<a name="line.271"></a>
|
||||
<span class="sourceLineNo">272</span> issuer.sendError(MinecraftMessageKeys.MULTIPLE_PLAYERS_MATCH,<a name="line.272"></a>
|
||||
<span class="sourceLineNo">273</span> "{search}", name, "{all}", allMatches);<a name="line.273"></a>
|
||||
<span class="sourceLineNo">274</span> return null;<a name="line.274"></a>
|
||||
<span class="sourceLineNo">275</span> }<a name="line.275"></a>
|
||||
<span class="sourceLineNo">276</span><a name="line.276"></a>
|
||||
<span class="sourceLineNo">277</span> //noinspection Duplicates<a name="line.277"></a>
|
||||
<span class="sourceLineNo">278</span> if (matches.isEmpty()) {<a name="line.278"></a>
|
||||
<span class="sourceLineNo">279</span> if (confirmList.isEmpty()) {<a name="line.279"></a>
|
||||
<span class="sourceLineNo">280</span> issuer.sendError(MinecraftMessageKeys.NO_PLAYER_FOUND_SERVER,<a name="line.280"></a>
|
||||
<span class="sourceLineNo">281</span> "{search}", name);<a name="line.281"></a>
|
||||
<span class="sourceLineNo">282</span> return null;<a name="line.282"></a>
|
||||
<span class="sourceLineNo">283</span> } else {<a name="line.283"></a>
|
||||
<span class="sourceLineNo">284</span> Player player = Iterables.getOnlyElement(confirmList);<a name="line.284"></a>
|
||||
<span class="sourceLineNo">285</span> issuer.sendInfo(MinecraftMessageKeys.PLAYER_IS_VANISHED_CONFIRM, "{vanished}", player.getName());<a name="line.285"></a>
|
||||
<span class="sourceLineNo">286</span> return null;<a name="line.286"></a>
|
||||
<span class="sourceLineNo">287</span> }<a name="line.287"></a>
|
||||
<span class="sourceLineNo">288</span> }<a name="line.288"></a>
|
||||
<span class="sourceLineNo">289</span><a name="line.289"></a>
|
||||
<span class="sourceLineNo">290</span> return matches.get(0);<a name="line.290"></a>
|
||||
<span class="sourceLineNo">291</span> }<a name="line.291"></a>
|
||||
<span class="sourceLineNo">292</span><a name="line.292"></a>
|
||||
<span class="sourceLineNo">293</span> return matches.get(0);<a name="line.293"></a>
|
||||
<span class="sourceLineNo">294</span> }<a name="line.294"></a>
|
||||
<span class="sourceLineNo">295</span><a name="line.295"></a>
|
||||
<span class="sourceLineNo">296</span> private static void findMatches(String search, CommandSender requester, List<Player> matches, List<Player> confirmList) {<a name="line.296"></a>
|
||||
<span class="sourceLineNo">297</span> // Remove vanished players from smart matching.<a name="line.297"></a>
|
||||
<span class="sourceLineNo">298</span> Iterator<Player> iter = matches.iterator();<a name="line.298"></a>
|
||||
<span class="sourceLineNo">299</span> //noinspection Duplicates<a name="line.299"></a>
|
||||
<span class="sourceLineNo">300</span> while (iter.hasNext()) {<a name="line.300"></a>
|
||||
<span class="sourceLineNo">301</span> Player player = iter.next();<a name="line.301"></a>
|
||||
<span class="sourceLineNo">302</span> if (requester instanceof Player && !((Player) requester).canSee(player)) {<a name="line.302"></a>
|
||||
<span class="sourceLineNo">303</span> if (requester.hasPermission("acf.seevanish")) {<a name="line.303"></a>
|
||||
<span class="sourceLineNo">304</span> if (!search.endsWith(":confirm")) {<a name="line.304"></a>
|
||||
<span class="sourceLineNo">305</span> confirmList.add(player);<a name="line.305"></a>
|
||||
<span class="sourceLineNo">306</span> iter.remove();<a name="line.306"></a>
|
||||
<span class="sourceLineNo">307</span> }<a name="line.307"></a>
|
||||
<span class="sourceLineNo">308</span> } else {<a name="line.308"></a>
|
||||
<span class="sourceLineNo">309</span> iter.remove();<a name="line.309"></a>
|
||||
<span class="sourceLineNo">310</span> }<a name="line.310"></a>
|
||||
<span class="sourceLineNo">311</span> }<a name="line.311"></a>
|
||||
<span class="sourceLineNo">312</span> }<a name="line.312"></a>
|
||||
<span class="sourceLineNo">313</span> }<a name="line.313"></a>
|
||||
<span class="sourceLineNo">314</span><a name="line.314"></a>
|
||||
<span class="sourceLineNo">315</span><a name="line.315"></a>
|
||||
<span class="sourceLineNo">316</span> public static boolean isValidName(String name) {<a name="line.316"></a>
|
||||
<span class="sourceLineNo">317</span> return name != null && !name.isEmpty() && ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches();<a name="line.317"></a>
|
||||
<span class="sourceLineNo">318</span> }<a name="line.318"></a>
|
||||
<span class="sourceLineNo">319</span><a name="line.319"></a>
|
||||
<span class="sourceLineNo">320</span> static boolean isValidItem(ItemStack item) {<a name="line.320"></a>
|
||||
<span class="sourceLineNo">321</span> return item != null && item.getType() != Material.AIR && item.getAmount() > 0;<a name="line.321"></a>
|
||||
<span class="sourceLineNo">322</span> }<a name="line.322"></a>
|
||||
<span class="sourceLineNo">323</span>}<a name="line.323"></a>
|
||||
<span class="sourceLineNo">293</span> private static void findMatches(String search, CommandSender requester, List<Player> matches, List<Player> confirmList) {<a name="line.293"></a>
|
||||
<span class="sourceLineNo">294</span> // Remove vanished players from smart matching.<a name="line.294"></a>
|
||||
<span class="sourceLineNo">295</span> Iterator<Player> iter = matches.iterator();<a name="line.295"></a>
|
||||
<span class="sourceLineNo">296</span> //noinspection Duplicates<a name="line.296"></a>
|
||||
<span class="sourceLineNo">297</span> while (iter.hasNext()) {<a name="line.297"></a>
|
||||
<span class="sourceLineNo">298</span> Player player = iter.next();<a name="line.298"></a>
|
||||
<span class="sourceLineNo">299</span> if (requester instanceof Player && !((Player) requester).canSee(player)) {<a name="line.299"></a>
|
||||
<span class="sourceLineNo">300</span> if (requester.hasPermission("acf.seevanish")) {<a name="line.300"></a>
|
||||
<span class="sourceLineNo">301</span> if (!search.endsWith(":confirm")) {<a name="line.301"></a>
|
||||
<span class="sourceLineNo">302</span> confirmList.add(player);<a name="line.302"></a>
|
||||
<span class="sourceLineNo">303</span> iter.remove();<a name="line.303"></a>
|
||||
<span class="sourceLineNo">304</span> }<a name="line.304"></a>
|
||||
<span class="sourceLineNo">305</span> } else {<a name="line.305"></a>
|
||||
<span class="sourceLineNo">306</span> iter.remove();<a name="line.306"></a>
|
||||
<span class="sourceLineNo">307</span> }<a name="line.307"></a>
|
||||
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
|
||||
<span class="sourceLineNo">309</span> }<a name="line.309"></a>
|
||||
<span class="sourceLineNo">310</span> }<a name="line.310"></a>
|
||||
<span class="sourceLineNo">311</span><a name="line.311"></a>
|
||||
<span class="sourceLineNo">312</span><a name="line.312"></a>
|
||||
<span class="sourceLineNo">313</span> public static boolean isValidName(String name) {<a name="line.313"></a>
|
||||
<span class="sourceLineNo">314</span> return name != null && !name.isEmpty() && ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches();<a name="line.314"></a>
|
||||
<span class="sourceLineNo">315</span> }<a name="line.315"></a>
|
||||
<span class="sourceLineNo">316</span><a name="line.316"></a>
|
||||
<span class="sourceLineNo">317</span> static boolean isValidItem(ItemStack item) {<a name="line.317"></a>
|
||||
<span class="sourceLineNo">318</span> return item != null && item.getType() != Material.AIR && item.getAmount() > 0;<a name="line.318"></a>
|
||||
<span class="sourceLineNo">319</span> }<a name="line.319"></a>
|
||||
<span class="sourceLineNo">320</span>}<a name="line.320"></a>
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user