diff options
| author | Noah van der Aa <[email protected]> | 2023-08-28 13:05:48 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-28 13:05:48 +0200 |
| commit | b8edb0e1306b570f76d0e2b4f59cceee24b838fd (patch) | |
| tree | fb38270ba72c64822ebd021369e7f36ab69ac9e2 /patches/server/0098-Async-GameProfileCache-saving.patch | |
| parent | 0c0a480d82132dca0e4bb7a2275c9363430e544b (diff) | |
| download | Paper-b8edb0e1306b570f76d0e2b4f59cceee24b838fd.tar.gz Paper-b8edb0e1306b570f76d0e2b4f59cceee24b838fd.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9648)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
6b34da8f SPIGOT-7467: Add getAddress to RemoteConsoleCommandSender
CraftBukkit Changes:
db4ba2897 SPIGOT-7467: Add getAddress to RemoteConsoleCommandSender
4f7ff4dec PR-1246: Add missing AbstractTestingBase to tests which need them
f70a7b68d SPIGOT-7465, MC-264979: Fresh installations print NoSuchFileException for server.properties
8ef7afef6 PR-1240: Call BlockGrowEvent for vines that are growing on additional sides of an existing vine block
Spigot Changes:
d2eba2c8 Rebuild patches
Diffstat (limited to 'patches/server/0098-Async-GameProfileCache-saving.patch')
| -rw-r--r-- | patches/server/0098-Async-GameProfileCache-saving.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0098-Async-GameProfileCache-saving.patch b/patches/server/0098-Async-GameProfileCache-saving.patch index f199705495..672588a1c4 100644 --- a/patches/server/0098-Async-GameProfileCache-saving.patch +++ b/patches/server/0098-Async-GameProfileCache-saving.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Async GameProfileCache saving diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c09ac4ef459c8df6c8623de7fbb63f8c2558bd2d..006289473c03c8484b26264c61eaf6a5e73658c0 100644 +index 0ee486f807d7c44e2252c4c744e29b506d916d9c..b5ededfb23980abca01ef25207cca95ad390a70d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -933,7 +933,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa +@@ -932,7 +932,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa } catch (java.lang.InterruptedException ignored) {} // Paper if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) { MinecraftServer.LOGGER.info("Saving usercache.json"); @@ -18,7 +18,7 @@ index c09ac4ef459c8df6c8623de7fbb63f8c2558bd2d..006289473c03c8484b26264c61eaf6a5 // Spigot end io.papermc.paper.chunk.system.io.RegionFileIOThread.close(true); // Paper // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 049f7dc31576980007eb8f0caab926bb58fead78..81a0a897a1fd2a408bfe43f24ed5e5f4bbefe161 100644 +index 2c2d492fdfafb1d2e4e962e6818bd9d7466347d5..131de2ca246cfbe4cb253e74cb05a73efbbcca73 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -242,7 +242,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface |