From 892f479fb4ef849ba834cbedd0069395cc1bef14 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 22 Feb 2020 15:30:42 +0000
Subject: [PATCH] Fix nullability annotation for Tameable#getOwnerUniqueId
 (Fixes #2968)

---
 .../0085-Tameable-getOwnerUniqueId-API.patch              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
index 0417c893e2..138ebacaec 100644
--- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 3f28b2263c941869901fd442a8cdf09cc619e7b6 Mon Sep 17 00:00:00 2001
+From 5cf43f147d4882bf3bd2199979fb4915b74e3e4c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 00:55:52 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
-index 0c066bdf..be436f8d 100644
+index 0c066bdf..957a6016 100644
 --- a/src/main/java/org/bukkit/entity/Tameable.java
 +++ b/src/main/java/org/bukkit/entity/Tameable.java
 @@ -1,5 +1,6 @@
@@ -27,7 +27,7 @@ index 0c066bdf..be436f8d 100644
 +     *
 +     * @return the owners UUID, or null if not owned
 +     */
-+    @NotNull
++    @Nullable
 +    public java.util.UUID getOwnerUniqueId();
 +    // Paper end
 +
@@ -41,5 +41,5 @@ index 0c066bdf..be436f8d 100644
       */
      @Nullable
 -- 
-2.25.0.windows.1
+2.25.0