Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only check sender presence and type when required.

Browse Source
This commit is contained in:
Olof Larsson 2015-08-10 11:17:31 +02:00
parent 5ee293a87b
commit 26f3485550
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/massivecraft/massivecore/cmd/arg/ARSenderIdAbstract.java
View File

@ -146,7 +146,12 @@ public abstract class ARSenderIdAbstract<T> extends ARAbstract<T>
if ( ! coll.contains(senderId)) continue; if ( ! coll.contains(senderId)) continue;
// ... and the presence check passes ... // ... and the presence check passes ...
if ( ! IdUtil.getMaintainedIds().contains(senderId, presence, type)) continue; // NOTE: Certain SenderColls will on purpose contain other things than players.
// NOTE: For that reason we only check sender presence and type if a certain one is required.
if (this.presence != SenderPresence.ANY || this.type != SenderType.ANY)
{
if ( ! IdUtil.getMaintainedIds().contains(senderId, this.presence, this.type)) continue;
}
// ... and the result is non null ... // ... and the result is non null ...
T result = this.getResultForSenderId(senderId); T result = this.getResultForSenderId(senderId);