mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-02 13:12:03 -07:00
a24f9b204c
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
38 lines
2.0 KiB
Diff
38 lines
2.0 KiB
Diff
--- a/net/minecraft/server/commands/ReloadCommand.java
|
|
+++ b/net/minecraft/server/commands/ReloadCommand.java
|
|
@@ -16,7 +_,7 @@
|
|
private static final Logger LOGGER = LogUtils.getLogger();
|
|
|
|
public static void reloadPacks(Collection<String> selectedIds, CommandSourceStack source) {
|
|
- source.getServer().reloadResources(selectedIds).exceptionally(throwable -> {
|
|
+ source.getServer().reloadResources(selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.COMMAND).exceptionally(throwable -> { // Paper - Add ServerResourcesReloadedEvent
|
|
LOGGER.warn("Failed to execute reload", throwable);
|
|
source.sendFailure(Component.translatable("commands.reload.failure"));
|
|
return null;
|
|
@@ -24,7 +_,7 @@
|
|
}
|
|
|
|
private static Collection<String> discoverNewPacks(PackRepository packRepository, WorldData worldData, Collection<String> selectedIds) {
|
|
- packRepository.reload();
|
|
+ packRepository.reload(true); // Paper - will perform a full reload
|
|
Collection<String> list = Lists.newArrayList(selectedIds);
|
|
Collection<String> disabled = worldData.getDataConfiguration().dataPacks().getDisabled();
|
|
|
|
@@ -36,6 +_,16 @@
|
|
|
|
return list;
|
|
}
|
|
+
|
|
+ // CraftBukkit start
|
|
+ public static void reload(MinecraftServer server) {
|
|
+ PackRepository packRepository = server.getPackRepository();
|
|
+ WorldData worldData = server.getWorldData();
|
|
+ Collection<String> selectedIds = packRepository.getSelectedIds();
|
|
+ Collection<String> collection = discoverNewPacks(packRepository, worldData, selectedIds);
|
|
+ server.reloadResources(collection, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN); // Paper - Add ServerResourcesReloadedEvent
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
|
|
dispatcher.register(Commands.literal("reload").requires(Commands.hasPermission(2)).executes(commandContext -> {
|