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

35 lines
1.3 KiB
Diff
Raw Normal View History

Update upstream
2018-07-25 23:05:07 +00:00
From 6a88f48f2414502aeda9ce864b9bf41a86541d13 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
Update upstream
2018-07-25 23:05:07 +00:00
index 83364efb50..f3af4ba520 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
Update upstream
2018-07-25 23:05:07 +00:00
@@ -788,8 +788,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
--
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 07:55:24 +00:00
2.18.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