Merge remote-tracking branch 'upstream/master'

This commit is contained in:
iamceph 2021-01-25 09:56:35 +01:00
commit e74d3ca0f6

View File

@ -161,11 +161,12 @@ public final class InstanceManager {
* @return {@link Optional#empty()} if instance is not found
*/
@NotNull
public Optional<Instance> getInstance(UUID uuid) {
return getInstances()
.stream()
.filter(instance -> instance.getUniqueId().equals(uuid))
.findFirst();
public @Nullable Instance getInstance(UUID uuid) {
Optional<Instance> instance = getInstances()
.stream()
.filter(someInstance -> someInstance.getUniqueId().equals(uuid))
.findFirst();
return instance.orElse(null);
}
/**