core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0063-Remove-Metadata-on-rel...

35 lines
1.3 KiB
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 02:27:40 +00:00
From 287ac1f2fdcbcaa146decc4f3942fe2fddf43945 Mon Sep 17 00:00:00 2001
Remove, not invalidate, Metadata on reload Objects loaded over different class loaders are not the same. Nasty dragons lie here. Also clean up the previous patch to no longer butcher imports.
2016-03-29 02:43:05 +00:00
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:50:14 -0400
Subject: [PATCH] Remove Metadata on reload
Metadata is not meant to persist reload as things break badly with non primitive types
This will remove metadata on reload so it does not crash everything if a plugin uses it.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.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 15:36:57 +00:00
index 68a40c12a9..86aa2ad322 100644
Remove, not invalidate, Metadata on reload Objects loaded over different class loaders are not the same. Nasty dragons lie here. Also clean up the previous patch to no longer butcher imports.
2016-03-29 02:43:05 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
More work for 1.14
2019-04-26 01:24:00 +00:00
@@ -795,8 +795,18 @@ public final class CraftServer implements Server {
Remove, not invalidate, Metadata on reload Objects loaded over different class loaders are not the same. Nasty dragons lie here. Also clean up the previous patch to no longer butcher imports.
2016-03-29 02:43:05 +00:00
world.paperConfig.init(); // Paper
}
Clear plugin metadata only after onDisable() Fixes GH-776
2017-07-15 19:38:16 +00:00
+ Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
pluginManager.clearPlugins();
commandMap.clearCommands();
+
Remove, not invalidate, Metadata on reload Objects loaded over different class loaders are not the same. Nasty dragons lie here. Also clean up the previous patch to no longer butcher imports.
2016-03-29 02:43:05 +00:00
+ // Paper start
Clear plugin metadata only after onDisable() Fixes GH-776
2017-07-15 19:38:16 +00:00
+ for (Plugin plugin : pluginClone) {
Remove, not invalidate, Metadata on reload Objects loaded over different class loaders are not the same. Nasty dragons lie here. Also clean up the previous patch to no longer butcher imports.
2016-03-29 02:43:05 +00:00
+ entityMetadata.removeAll(plugin);
+ worldMetadata.removeAll(plugin);
+ playerMetadata.removeAll(plugin);
+ }
+ // Paper end
+
resetRecipes();
Clear plugin metadata only after onDisable() Fixes GH-776
2017-07-15 19:38:16 +00:00
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
Remove, not invalidate, Metadata on reload Objects loaded over different class loaders are not the same. Nasty dragons lie here. Also clean up the previous patch to no longer butcher imports.
2016-03-29 02:43:05 +00:00
--
Initial work on 1.14 pre-5
2019-04-23 04:47:07 +00:00
2.21.0
Remove, not invalidate, Metadata on reload Objects loaded over different class loaders are not the same. Nasty dragons lie here. Also clean up the previous patch to no longer butcher imports.
2016-03-29 02:43:05 +00:00