mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 12:48:53 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
45 lines
2.6 KiB
Diff
45 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Wed, 25 Nov 2020 16:33:27 -0800
|
|
Subject: [PATCH] Add PlayerLoomPatternSelectEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/LoomMenu.java b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
|
|
index 58470d8e9a4ceb1eca05b342481ed8260588e225..1b7cf165ab0818792870f43719a6324b282bb57a 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/LoomMenu.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
|
|
@@ -162,8 +162,32 @@ public class LoomMenu extends AbstractContainerMenu {
|
|
@Override
|
|
public boolean clickMenuButton(net.minecraft.world.entity.player.Player player, int id) {
|
|
if (id >= 0 && id < this.selectablePatterns.size()) {
|
|
- this.selectedBannerPatternIndex.set(id);
|
|
- this.setupResultSlot((Holder) this.selectablePatterns.get(id));
|
|
+ // Paper start - Add PlayerLoomPatternSelectEvent
|
|
+ int selectablePatternIndex = id;
|
|
+ io.papermc.paper.event.player.PlayerLoomPatternSelectEvent event = new io.papermc.paper.event.player.PlayerLoomPatternSelectEvent((Player) player.getBukkitEntity(), ((CraftInventoryLoom) getBukkitView().getTopInventory()), org.bukkit.craftbukkit.block.banner.CraftPatternType.minecraftHolderToBukkit(this.selectablePatterns.get(selectablePatternIndex)));
|
|
+ if (!event.callEvent()) {
|
|
+ player.containerMenu.sendAllDataToRemote();
|
|
+ return false;
|
|
+ }
|
|
+ final Holder<BannerPattern> eventPattern = org.bukkit.craftbukkit.block.banner.CraftPatternType.bukkitToMinecraftHolder(event.getPatternType());
|
|
+ Holder<BannerPattern> selectedPattern = null;
|
|
+ for (int i = 0; i < this.selectablePatterns.size(); i++) {
|
|
+ final Holder<BannerPattern> holder = this.selectablePatterns.get(i);
|
|
+ if (eventPattern.equals(holder)) {
|
|
+ selectablePatternIndex = i;
|
|
+ selectedPattern = holder;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ if (selectedPattern == null) {
|
|
+ selectedPattern = eventPattern;
|
|
+ selectablePatternIndex = -1;
|
|
+ }
|
|
+
|
|
+ player.containerMenu.sendAllDataToRemote();
|
|
+ this.selectedBannerPatternIndex.set(selectablePatternIndex);
|
|
+ this.setupResultSlot(java.util.Objects.requireNonNull(selectedPattern, "selectedPattern was null, this is unexpected"));
|
|
+ // Paper end - Add PlayerLoomPatternSelectEvent
|
|
return true;
|
|
} else {
|
|
return false;
|