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

Add evasion of low risk NPE in TypeSenderIdAbstract

Browse Source
This commit is contained in:
Olof Larsson 2017-08-08 17:22:34 +02:00
parent 8b9112c2da
commit 0f098dd31c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java
View File

@ -110,16 +110,18 @@ public abstract class TypeSenderIdAbstract<T> extends TypeAbstract<T>
// All of our subclasses return null if senderId is null. // All of our subclasses return null if senderId is null.
// Thus we don't need to check for that being null, but only check ret. // Thus we don't need to check for that being null, but only check ret.
// If presence is online or local ... // If presence is online or local and the target is not visible for the sender then throw an error.
if (this.presence == SenderPresence.LOCAL || this.presence == SenderPresence.ONLINE) if
(
(this.presence == SenderPresence.LOCAL || this.presence == SenderPresence.ONLINE)
&&
senderId != null
&&
!MixinVisibility.get().isVisible(senderId, sender)
)
{ {
// ... and the target is not visible for the sender ...
if (!MixinVisibility.get().isVisible(senderId, sender))
{
// .. throw an error.
throwError(arg); throwError(arg);
} }
}
// Create & populate Ret // Create & populate Ret
T ret = this.getResultForSenderId(senderId); T ret = this.getResultForSenderId(senderId);