mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-16 08:57:05 +02:00
e6f8284125
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: d43a1e72 SPIGOT-2450: Improve scoreboard criteria API, add missing DisplaySlots 9d6e4847 SPIGOT-7122: New Allay Methods from 1.19.1 CraftBukkit Changes: c379a6b4e SPIGOT-2450: Improve scoreboard criteria API, add missing DisplaySlots 051fcced1 SPIGOT-7122: New Allay Methods from 1.19.1
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 858707ce778fad5bbdcc31e61de57dbfed2f94b4..460d95ece9a9ba053a50d5a1cf69ac3bc85131a3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -950,8 +950,16 @@ public final class CraftServer implements Server {
|
|
world.spigotConfig.init(); // Spigot
|
|
}
|
|
|
|
+ Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
|
|
this.pluginManager.clearPlugins();
|
|
this.commandMap.clearCommands();
|
|
+ // Paper start
|
|
+ for (Plugin plugin : pluginClone) {
|
|
+ entityMetadata.removeAll(plugin);
|
|
+ worldMetadata.removeAll(plugin);
|
|
+ playerMetadata.removeAll(plugin);
|
|
+ }
|
|
+ // Paper end
|
|
this.reloadData();
|
|
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
|
|
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
|