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

35 lines
1.3 KiB
Diff
Raw Normal View History

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 Bukkit Changes: 6a4242cb #468: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c6697f90 SPIGOT-5559: Add EntityPotionEffectEvent causes for PATROL_CAPTAIN and WITHER_ROSE 9c1fa040 #467: Add method to remove a recipe by its key 3961d1aa Add nb-configuration.xml to .gitignore CraftBukkit Changes: d70084e5 Remove unused seed in CustomChunkGenerator 8a66d4c7 #619: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c2dc19d3 Craftbukkit -> CraftBukkit ae45e092 SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose 00980376 #618: Add method to remove a recipe by its key Spigot Changes: c574e08b Rebuild patches 13c24cc4 Rebuild patches
2020-02-02 11:53:48 +00:00
From b098719121fc98fcaf4d0640e38972bd497722e7 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 (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 Bukkit Changes: 6a4242cb #468: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c6697f90 SPIGOT-5559: Add EntityPotionEffectEvent causes for PATROL_CAPTAIN and WITHER_ROSE 9c1fa040 #467: Add method to remove a recipe by its key 3961d1aa Add nb-configuration.xml to .gitignore CraftBukkit Changes: d70084e5 Remove unused seed in CustomChunkGenerator 8a66d4c7 #619: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c2dc19d3 Craftbukkit -> CraftBukkit ae45e092 SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose 00980376 #618: Add method to remove a recipe by its key Spigot Changes: c574e08b Rebuild patches 13c24cc4 Rebuild patches
2020-02-02 11:53:48 +00:00
index 117b349c0..1cfdfcdd3 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
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 Bukkit Changes: 6a4242cb #468: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c6697f90 SPIGOT-5559: Add EntityPotionEffectEvent causes for PATROL_CAPTAIN and WITHER_ROSE 9c1fa040 #467: Add method to remove a recipe by its key 3961d1aa Add nb-configuration.xml to .gitignore CraftBukkit Changes: d70084e5 Remove unused seed in CustomChunkGenerator 8a66d4c7 #619: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c2dc19d3 Craftbukkit -> CraftBukkit ae45e092 SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose 00980376 #618: Add method to remove a recipe by its key Spigot Changes: c574e08b Rebuild patches 13c24cc4 Rebuild patches
2020-02-02 11:53:48 +00:00
@@ -803,8 +803,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
--
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 Bukkit Changes: 6a4242cb #468: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c6697f90 SPIGOT-5559: Add EntityPotionEffectEvent causes for PATROL_CAPTAIN and WITHER_ROSE 9c1fa040 #467: Add method to remove a recipe by its key 3961d1aa Add nb-configuration.xml to .gitignore CraftBukkit Changes: d70084e5 Remove unused seed in CustomChunkGenerator 8a66d4c7 #619: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c2dc19d3 Craftbukkit -> CraftBukkit ae45e092 SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose 00980376 #618: Add method to remove a recipe by its key Spigot Changes: c574e08b Rebuild patches 13c24cc4 Rebuild patches
2020-02-02 11:53:48 +00:00
2.25.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