mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 07:20:24 +01:00
37 lines
2.4 KiB
Diff
37 lines
2.4 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 d639ead95c36985fa0f5a9c51898c4237e373f0e..4e468cb7ccf683b8fc9e04a48cfc25779775e25f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
@@ -178,6 +178,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot
|
||
|
|
|
||
|
|
public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements SnooperPopulator, CommandSource, AutoCloseable {
|
||
|
|
|
||
|
|
+ private static MinecraftServer SERVER; // Paper
|
||
|
|
public static final Logger LOGGER = LogManager.getLogger();
|
||
|
|
public static final File USERID_CACHE_FILE = new File("usercache.json");
|
||
|
|
public static final LevelSettings DEMO_SETTINGS = new LevelSettings("Demo World", GameType.SURVIVAL, false, Difficulty.NORMAL, false, new GameRules(), DataPackConfig.DEFAULT);
|
||
|
|
@@ -284,6 +285,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||
|
|
|
||
|
|
public MinecraftServer(OptionSet options, DataPackConfig datapackconfiguration, Thread thread, RegistryAccess.RegistryHolder iregistrycustom_dimension, LevelStorageSource.LevelStorageAccess convertable_conversionsession, WorldData savedata, PackRepository resourcepackrepository, Proxy proxy, DataFixer datafixer, ServerResources datapackresources, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, GameProfileCache usercache, ChunkProgressListenerFactory worldloadlistenerfactory) {
|
||
|
|
super("Server");
|
||
|
|
+ SERVER = this; // Paper - better singleton
|
||
|
|
this.continousProfiler = new ContinuousProfiler(Util.timeSource, this::getTickCount);
|
||
|
|
this.profiler = InactiveProfiler.INSTANCE;
|
||
|
|
this.status = new ServerStatus();
|
||
|
|
@@ -2161,7 +2163,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||
|
|
|
||
|
|
@Deprecated
|
||
|
|
public static MinecraftServer getServer() {
|
||
|
|
- return (Bukkit.getServer() instanceof CraftServer) ? ((CraftServer) Bukkit.getServer()).getServer() : null;
|
||
|
|
+ return SERVER; // Paper
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
|