From d733dbbc3f4073ca5220f8d26a4ed92ba9aea46c Mon Sep 17 00:00:00 2001
From: KrystilizeNevaDies
 <57762380+KrystilizeNevaDies@users.noreply.github.com>
Date: Mon, 25 Jan 2021 17:25:51 +1000
Subject: [PATCH] Upate getInstance(UUID) to return nullable instance

---
 .../net/minestom/server/instance/InstanceManager.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/minestom/server/instance/InstanceManager.java b/src/main/java/net/minestom/server/instance/InstanceManager.java
index 9ad83600d..ccbbc9e60 100644
--- a/src/main/java/net/minestom/server/instance/InstanceManager.java
+++ b/src/main/java/net/minestom/server/instance/InstanceManager.java
@@ -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);
     }
 
     /**