diff options
Diffstat (limited to 'Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch')
| -rw-r--r-- | Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch index f439fe17fe..87594bc895 100644 --- a/Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From a47d239dfc2f8dcf30bf36ef6d228b20fb8f78b6 Mon Sep 17 00:00:00 2001 +From 4d88a9833dba3f9449be3f9bc0a9d8f773024fc7 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 a5ebb17..6fbe9e6 100644 +index 01325b3..9455475 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 a5ebb17..6fbe9e6 100644 io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable this.e = proxy; this.U = yggdrasilauthenticationservice; -@@ -1605,7 +1607,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -1603,7 +1605,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs // CraftBukkit start @Deprecated public static MinecraftServer getServer() { @@ -35,5 +35,5 @@ index a5ebb17..6fbe9e6 100644 // CraftBukkit end } -- -2.10.0.windows.1 +2.10.1 |