Paper/Spigot-Server-Patches/0122-remove-null-possibility-for-getServer-singleton.patch

40 lines
1.9 KiB
Diff
Raw Normal View History

2018-01-11 06:31:19 +01:00
From 01df906a57e1cfd688312b4b0802e6e48ea17b42 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 28 Apr 2016 00:57:27 -0400
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
2018-01-11 06:31:19 +01:00
index b6c4d98f..45d3dbde 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2017-08-03 16:36:06 +02:00
@@ -53,6 +53,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
2017-05-14 20:05:01 +02:00
public abstract class MinecraftServer implements ICommandListener, Runnable, IAsyncTaskHandler, IMojangStatistics {
+ private static MinecraftServer SERVER; // Paper
public static final Logger LOGGER = LogManager.getLogger();
public static final File a = new File("usercache.json");
public Convertable convertable;
2017-08-03 16:36:06 +02:00
@@ -124,6 +125,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
2017-01-31 05:33:54 +01:00
// Spigot end
public MinecraftServer(OptionSet options, Proxy proxy, DataConverterManager dataconvertermanager, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) {
+ SERVER = this; // Paper - better singleton
io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
this.e = proxy;
2016-11-17 03:23:38 +01:00
this.V = yggdrasilauthenticationservice;
2017-08-03 16:36:06 +02:00
@@ -1636,7 +1638,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
// CraftBukkit start
@Deprecated
public static MinecraftServer getServer() {
- return (Bukkit.getServer() instanceof CraftServer) ? ((CraftServer) Bukkit.getServer()).getServer() : null;
+ return SERVER;
}
// CraftBukkit end
}
--
2018-01-11 06:31:19 +01:00
2.14.3