mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-22 12:54:49 +02:00
9df2066642
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: dfe1fb48 PR-906: Add missing MinecraftExperimental annotation to Bundles 825ab30d PR-905: Add missing MapCursor.Type and update documentation e03d10e6 PR-903: Make BARRIER Waterlogged 1961ead6 PR-898: Use Java Consumer instead of Bukkit Consumer CraftBukkit Changes: f71a799f0 Make BARRIER Waterlogged 172f76a45 Upgrade specialsource-maven-plugin f0702775c SPIGOT-7486: Alternate approach to null profile names 069495671 SPIGOT-7485: Allow air entity items since required for Vanilla logic 5dfd33dc2 SPIGOT-7484: Cancelling PlayerEditBookEvent does not update client's book contents 02d490788 PR-1250: Standardize and centralize Bukkit / Minecraft registry conversion 9024a09b9 PR-1251: Use Java Consumer instead of Bukkit Consumer 6d4b25bf1 Increase diff stability
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 135fe9abe46d31cdf3a5fb3fb3dfd296e658e2cf..69934e156db7fdec00b6b77b20835894a1e3dcb3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -955,8 +955,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
|