2021-06-14 21:17:47 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 2 Dec 2020 20:04:01 -0800
2024-01-19 22:13:42 +01:00
Subject: [PATCH] Add ServerResourcesReloadedEvent
2021-06-14 21:17:47 +02:00
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2024-10-27 18:11:15 +01:00
index f6667d9f514a821fd539e193dde1f78e77ca0fbf..264d0f57422b4fc03c5845d7456b22c9a48dd7ae 100644
2021-06-14 21:17:47 +02:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2024-10-27 18:11:15 +01:00
@@ -2150,7 +2150,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2021-06-14 21:17:47 +02:00
return this.functionManager;
}
2024-01-19 22:13:42 +01:00
+ // Paper start - Add ServerResourcesReloadedEvent
2023-03-19 20:28:28 +01:00
+ @Deprecated @io.papermc.paper.annotation.DoNotUse
2022-03-01 06:43:03 +01:00
public CompletableFuture<Void> reloadResources(Collection<String> dataPacks) {
+ return this.reloadResources(dataPacks, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN);
2021-06-14 21:17:47 +02:00
+ }
2022-03-01 06:43:03 +01:00
+ public CompletableFuture<Void> reloadResources(Collection<String> dataPacks, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause cause) {
2024-01-19 22:13:42 +01:00
+ // Paper end - Add ServerResourcesReloadedEvent
2021-06-14 21:17:47 +02:00
CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
2022-03-01 06:43:03 +01:00
Stream<String> stream = dataPacks.stream(); // CraftBukkit - decompile error
2024-04-24 15:46:45 +02:00
PackRepository resourcepackrepository = this.packRepository;
2024-10-27 18:11:15 +01:00
@@ -2185,6 +2191,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2023-03-19 20:28:28 +01:00
this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
2024-10-23 17:58:11 +02:00
this.fuelValues = FuelValues.vanillaBurnTimes(this.registries.compositeAccess(), this.worldData.enabledFeatures());
2024-01-20 12:50:16 +01:00
org.bukkit.craftbukkit.block.data.CraftBlockData.reloadCache(); // Paper - cache block data strings; they can be defined by datapacks so refresh it here
2024-01-19 22:13:42 +01:00
+ new io.papermc.paper.event.server.ServerResourcesReloadedEvent(cause).callEvent(); // Paper - Add ServerResourcesReloadedEvent; fire after everything has been reloaded
2023-03-19 20:28:28 +01:00
}, this);
2022-12-07 21:16:54 +01:00
2023-03-19 20:28:28 +01:00
if (this.isSameThread()) {
2021-06-14 21:17:47 +02:00
diff --git a/src/main/java/net/minecraft/server/commands/ReloadCommand.java b/src/main/java/net/minecraft/server/commands/ReloadCommand.java
2024-01-19 22:13:42 +01:00
index fa18d018a8458b30c0048f7e59aea39f928d974a..c020c86194723a5c89816f91e0b7c5eeaf132b7e 100644
2021-06-14 21:17:47 +02:00
--- a/src/main/java/net/minecraft/server/commands/ReloadCommand.java
+++ b/src/main/java/net/minecraft/server/commands/ReloadCommand.java
@@ -20,7 +20,7 @@ public class ReloadCommand {
public ReloadCommand() {}
public static void reloadPacks(Collection<String> dataPacks, CommandSourceStack source) {
- source.getServer().reloadResources(dataPacks).exceptionally((throwable) -> {
2024-01-19 22:13:42 +01:00
+ source.getServer().reloadResources(dataPacks, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.COMMAND).exceptionally((throwable) -> { // Paper - Add ServerResourcesReloadedEvent
2021-06-14 21:17:47 +02:00
ReloadCommand.LOGGER.warn("Failed to execute reload", throwable);
2022-06-08 09:30:41 +02:00
source.sendFailure(Component.translatable("commands.reload.failure"));
2021-06-14 21:17:47 +02:00
return null;
@@ -50,7 +50,7 @@ public class ReloadCommand {
WorldData savedata = minecraftserver.getWorldData();
Collection<String> collection = resourcepackrepository.getSelectedIds();
Collection<String> collection1 = ReloadCommand.discoverNewPacks(resourcepackrepository, savedata, collection);
- minecraftserver.reloadResources(collection1);
2024-01-19 22:13:42 +01:00
+ minecraftserver.reloadResources(collection1, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN); // Paper - Add ServerResourcesReloadedEvent
2021-06-14 21:17:47 +02:00
}
// CraftBukkit end