Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-20 09:35:39 +01:00
Code Issues Projects Releases Wiki Activity
70ce6ce831
Paper/Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch

40 lines
2.2 KiB
Diff
Raw Normal View History

Move version command update checking to the implementation This makes it easier for downstream projects (forks) to replace the version fetching system with their own. It is as simple as implementing an interface and overriding the default implementation of org.bukkit.UnsafeValues#getVersionFetcher() It also makes it easier for us to organize things like the version history feature. Lastly I have updated the paper implementation to check against the site API rather than against jenkins.
2019-05-27 11:13:41 +02:00
From 8d4d0568b508b622988c62ecd54d1565f9e03b53 Mon Sep 17 00:00:00 2001
Improve Maps (in item frames) performance and bug fixes Maps used a modified version of rendering to support plugin controlled imaging on maps. The Craft Map Renderer is much slower than Vanilla, causing maps in item frames to cause a noticeable hit on server performance. This updates the map system to not use the Craft system if we detect that no custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed.
2016-04-30 02:04:12 +02:00
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
Move version command update checking to the implementation This makes it easier for downstream projects (forks) to replace the version fetching system with their own. It is as simple as implementing an interface and overriding the default implementation of org.bukkit.UnsafeValues#getVersionFetcher() It also makes it easier for us to organize things like the version history feature. Lastly I have updated the paper implementation to check against the site API rather than against jenkins.
2019-05-27 11:13:41 +02:00
index 7a860231e..d3d8fffeb 100644
Improve Maps (in item frames) performance and bug fixes Maps used a modified version of rendering to support plugin controlled imaging on maps. The Craft Map Renderer is much slower than Vanilla, causing maps in item frames to cause a noticeable hit on server performance. This updates the map system to not use the Craft system if we detect that no custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed.
2016-04-30 02:04:12 +02:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
More 1.14 updates (#1995)
2019-04-27 05:05:36 +02:00
@@ -61,6 +61,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
Improve Maps (in item frames) performance and bug fixes Maps used a modified version of rendering to support plugin controlled imaging on maps. The Craft Map Renderer is much slower than Vanilla, causing maps in item frames to cause a noticeable hit on server performance. This updates the map system to not use the Craft system if we detect that no custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed.
2016-04-30 02:04:12 +02:00
More 1.14 updates (#1995)
2019-04-27 05:05:36 +02:00
public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable, Runnable {
Improve Maps (in item frames) performance and bug fixes Maps used a modified version of rendering to support plugin controlled imaging on maps. The Craft Map Renderer is much slower than Vanilla, causing maps in item frames to cause a noticeable hit on server performance. This updates the map system to not use the Craft system if we detect that no custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed.
2016-04-30 02:04:12 +02:00
+ private static MinecraftServer SERVER; // Paper
public static final Logger LOGGER = LogManager.getLogger();
More 1.14 updates (#1995)
2019-04-27 05:05:36 +02:00
public static final File b = new File("usercache.json");
public static final WorldSettings c = (new WorldSettings((long) "North Carolina".hashCode(), EnumGamemode.SURVIVAL, true, false, WorldType.NORMAL)).a();
Update Upstream
2019-05-06 04:58:04 +02:00
@@ -167,6 +168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
Improve Maps (in item frames) performance and bug fixes Maps used a modified version of rendering to support plugin controlled imaging on maps. The Craft Map Renderer is much slower than Vanilla, causing maps in item frames to cause a noticeable hit on server performance. This updates the map system to not use the Craft system if we detect that no custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed.
2016-04-30 02:04:12 +02:00
More 1.14 updates (#1995)
2019-04-27 05:05:36 +02:00
public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
super("Server");
Improve Maps (in item frames) performance and bug fixes Maps used a modified version of rendering to support plugin controlled imaging on maps. The Craft Map Renderer is much slower than Vanilla, causing maps in item frames to cause a noticeable hit on server performance. This updates the map system to not use the Craft system if we detect that no custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed.
2016-04-30 02:04:12 +02:00
+ SERVER = this; // Paper - better singleton
More 1.14 updates (#1995)
2019-04-27 05:05:36 +02:00
this.ae = new ResourceManager(EnumResourcePackType.SERVER_DATA, this.serverThread);
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Warning: this commit contains more mapping changes from upstream, As always, ensure that you have working backups and test this build before deployment; Developers working on paper will, yet again, need to delete their work/Minecraft/1.13.2 folder Bukkit Changes: 7fca5fd4 SPIGOT-4558: Preserve user order in the face of copied defaults in configurations 15c9b1eb Ignore spurious slot IDs sent by client, e.g. in enchanting tables 5d2a10c5 SPIGOT-3747: Add API for force loaded chunks d6dd2bb3 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent 771db4aa SPIGOT-794: Call EntityPlaceEvent for Minecart placement 55462509 Add InventoryView#getSlotType 2f3ce5b6 Remove EntityTransformEvent and CustomItemTagContainer from draft API f04ad7b6 Make ProjectileLaunchEvent extend EntitySpawnEvent ccb85808 Define EntitySpawnEvent b8cc3ebe Add PlayerItemDamageEvent 184a495d Ease ClassLoader Deadlocks Where Possible 11ac4728 Expand Boolean Prompt Values in Conversation API aae62d51 Added getAllSessionData() to the Conversation API. 9290ff91 Add InventoryView#getInventory API 995e530f Add API to get / set base arrow damage CraftBukkit Changes: c4a67eed SPIGOT-4556: Fix plugins closing inventory during drop events 5be2ddcb Replace version constants with methods to prevent compiler inlining a5b9c7b3 Use API method to create offset command completions 2bc7d1df SPIGOT-3747: Add API for force loaded chunks a408f375 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent b54b9409 SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock 79ded7a8 SPIGOT-1811: Death message not shown on respawn screen b4a4f15d SPIGOT-943: InventoryCloseEvent called on death regardless of open inventory 0afed592 SPIGOT-794: Call EntityPlaceEvent for Minecart placement 2b2d084a Add InventoryView#getSlotType 01a9959a Do not use deprecated ItemSpawnEvent constructor 9642498d SPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event 963f4a5f Add PlayerItemDamageEvent 63db0445 Add API to get / set base arrow damage 531c25d7 Add CraftMagicNumbers.MAPPINGS_VERSION for use by NMS plugins d05c8b14 Mappings Update bd36e200 SPIGOT-4551: Ignore invalid attribute modifier slots Spigot Changes: 518206a1 Remove redundant trove depend 1959ad21 MC-11211,SPIGOT-4552: Fix placing double slabs at y = 255 29ab5e43 SPIGOT-3661: Allow arguments in restart-script 7cc46316 SPIGOT-852: Growth modifiers for beetroots, potatoes, carrots 82e117e1 Squelch "fatal: Resolve operation not in progress" message 0a1a68e7 Mappings Update & Patch Rebuild
2019-01-01 04:15:55 +01:00
this.resourcePackRepository = new ResourcePackRepository<>(ResourcePackLoader::new);
More 1.14 updates (#1995)
2019-04-27 05:05:36 +02:00
this.ai = new CraftingManager();
Remove TPS catchup improvements These changes are incompatbile as-is with 1.14 due to the Thread.sleep call, this should ideally be brought back in the future
2019-05-22 05:58:00 +02:00
@@ -1906,7 +1908,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
More 1.14 updates (#1995)
2019-04-27 05:05:36 +02:00
Improve Maps (in item frames) performance and bug fixes Maps used a modified version of rendering to support plugin controlled imaging on maps. The Craft Map Renderer is much slower than Vanilla, causing maps in item frames to cause a noticeable hit on server performance. This updates the map system to not use the Craft system if we detect that no custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed.
2016-04-30 02:04:12 +02:00
@Deprecated
public static MinecraftServer getServer() {
- return (Bukkit.getServer() instanceof CraftServer) ? ((CraftServer) Bukkit.getServer()).getServer() : null;
More 1.14 updates (#1995)
2019-04-27 05:05:36 +02:00
+ return SERVER; // Paper
Improve Maps (in item frames) performance and bug fixes Maps used a modified version of rendering to support plugin controlled imaging on maps. The Craft Map Renderer is much slower than Vanilla, causing maps in item frames to cause a noticeable hit on server performance. This updates the map system to not use the Craft system if we detect that no custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed.
2016-04-30 02:04:12 +02:00
}
// CraftBukkit end
Simplify getEntity by UUID patch, misc readme changes
2016-06-10 04:43:32 +02:00
}
Improve Maps (in item frames) performance and bug fixes Maps used a modified version of rendering to support plugin controlled imaging on maps. The Craft Map Renderer is much slower than Vanilla, causing maps in item frames to cause a noticeable hit on server performance. This updates the map system to not use the Craft system if we detect that no custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed.
2016-04-30 02:04:12 +02:00
--
Initial work on 1.14 pre-5
2019-04-23 06:47:07 +02:00
2.21.0
Improve Maps (in item frames) performance and bug fixes Maps used a modified version of rendering to support plugin controlled imaging on maps. The Craft Map Renderer is much slower than Vanilla, causing maps in item frames to cause a noticeable hit on server performance. This updates the map system to not use the Craft system if we detect that no custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed.
2016-04-30 02:04:12 +02:00
Reference in New Issue Copy Permalink