Paper/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch

39 lines
2.1 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
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
2023-03-15 13:19:54 +01:00
index 18499be3d671987a743e6001347fb7ffb023039c..0cb581700dd994a0585e5f8f73489d90f2c0ac0d 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2022-12-07 19:52:24 +01:00
@@ -193,6 +193,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
2021-06-11 14:02:28 +02:00
2021-11-23 14:22:49 +01:00
public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements CommandSource, AutoCloseable {
2021-06-11 14:02:28 +02:00
+ private static MinecraftServer SERVER; // Paper
2022-03-01 06:43:03 +01:00
public static final Logger LOGGER = LogUtils.getLogger();
2021-11-23 14:22:49 +01:00
public static final String VANILLA_BRAND = "vanilla";
2021-06-12 06:38:04 +02:00
private static final float AVERAGE_TICK_TIME_SMOOTHING = 0.8F;
2023-03-14 19:36:39 +01:00
@@ -321,6 +322,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2021-06-11 14:02:28 +02:00
2022-12-07 19:52:24 +01:00
public MinecraftServer(OptionSet options, WorldLoader.DataLoadContext worldLoader, Thread thread, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, ChunkProgressListenerFactory worldloadlistenerfactory) {
2021-06-11 14:02:28 +02:00
super("Server");
+ SERVER = this; // Paper - better singleton
2021-06-12 06:38:04 +02:00
this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
this.profiler = this.metricsRecorder.getProfiler();
this.onMetricsRecordingStopped = (methodprofilerresults) -> {
2023-03-15 13:19:54 +01:00
@@ -2333,9 +2335,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2022-06-09 23:27:06 +02:00
return false;
}
2021-06-11 14:02:28 +02:00
2022-06-09 23:27:06 +02:00
- @Deprecated
2021-06-11 14:02:28 +02:00
public static MinecraftServer getServer() {
- return (Bukkit.getServer() instanceof CraftServer) ? ((CraftServer) Bukkit.getServer()).getServer() : null;
+ return SERVER; // Paper
}
// CraftBukkit end