mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-01 05:47:45 +01:00
37 lines
1.9 KiB
Diff
37 lines
1.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 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
|
||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
@@ -0,0 +0,0 @@ import java.util.Queue;
|
||
|
|
||
|
public abstract class MinecraftServer implements Runnable, ICommandListener, 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;
|
||
|
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||
|
// CraftBukkit 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;
|
||
|
this.U = yggdrasilauthenticationservice;
|
||
|
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
||
|
// CraftBukkit start
|
||
|
@Deprecated
|
||
|
public static MinecraftServer getServer() {
|
||
|
- return (Bukkit.getServer() instanceof CraftServer) ? ((CraftServer) Bukkit.getServer()).getServer() : null;
|
||
|
+ return SERVER;
|
||
|
}
|
||
|
// CraftBukkit end
|
||
|
|
||
|
--
|