mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-15 07:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
7fc60e411a
Paper/Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch

23 lines
879 B
Diff
Raw Normal View History

Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) 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 Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
2019-06-14 10:27:40 +08:00
From 777435ba526984c7880a92d1a44bed52ac4ef1c9 Mon Sep 17 00:00:00 2001
Fix MCUtils and other calls to postTaskOnMain Method changed changed it's role to providing a TickTask object which isn't automatically scheduled onto the server
2019-05-11 01:42:33 +08:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 10 May 2019 18:38:19 +0100
Subject: [PATCH] Fix CB call to changed postToMainThread method
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
Updated Upstream (CraftBukkit) 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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
2019-06-06 23:36:57 +08:00
index 4e8b8f49c4..a0b644801a 100644
Fix MCUtils and other calls to postTaskOnMain Method changed changed it's role to providing a TickTask object which isn't automatically scheduled onto the server
2019-05-11 01:42:33 +08:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
Re-add dropped keep alive disconnect Should fix the terminal spam
2019-05-14 12:17:05 +08:00
@@ -282,7 +282,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
Fix MCUtils and other calls to postTaskOnMain Method changed changed it's role to providing a TickTask object which isn't automatically scheduled onto the server
2019-05-11 01:42:33 +08:00
this.networkManager.getClass();
// CraftBukkit - Don't wait
- minecraftserver.postToMainThread(networkmanager::handleDisconnection);
+ minecraftserver.scheduleOnMain(networkmanager::handleDisconnection); // Paper
}
@Override
--
2.21.0
Reference in New Issue Copy Permalink