diff options
Diffstat (limited to 'Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch')
| -rw-r--r-- | Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch index f963f682e6..14b13519e0 100644 --- a/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From 4acc11dbab4d03e506392d6457501c23d5c11b81 Mon Sep 17 00:00:00 2001 +From 87108169b3fd2c3f92b9367a43d6a66dabbedf95 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton @@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton to stop IDE complaining about potential NPE diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 544d601..4f7269b 100644 +index 90cce4a..25c4f9f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -49,6 +49,7 @@ import co.aikar.timings.MinecraftTimings; // Paper @@ -25,7 +25,7 @@ index 544d601..4f7269b 100644 io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable this.e = proxy; this.U = yggdrasilauthenticationservice; -@@ -1610,7 +1612,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -1604,7 +1606,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs // CraftBukkit start @Deprecated public static MinecraftServer getServer() { @@ -35,5 +35,5 @@ index 544d601..4f7269b 100644 // CraftBukkit end } -- -2.10.0.windows.1 +2.9.3 |