928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
89 lines
2.5 KiB
Diff
89 lines
2.5 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:42 -0800
|
|
Subject: [PATCH] Added PlayerLoomPatternSelectEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerLoomPatternSelectEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerLoomPatternSelectEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..8cb05709f7cb5dee993ff6fea1626c41b90a7d8b
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerLoomPatternSelectEvent.java
|
|
@@ -0,0 +1,77 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import org.bukkit.block.banner.PatternType;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.bukkit.inventory.LoomInventory;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a player selects a banner patten in a loom inventory.
|
|
+ */
|
|
+public class PlayerLoomPatternSelectEvent extends PlayerEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private boolean cancelled;
|
|
+ private final LoomInventory loomInventory;
|
|
+ private PatternType patternType;
|
|
+
|
|
+ public PlayerLoomPatternSelectEvent(@NotNull Player player, @NotNull LoomInventory loomInventory, @NotNull PatternType patternType) {
|
|
+ super(player);
|
|
+ this.loomInventory = loomInventory;
|
|
+ this.patternType = patternType;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the loom inventory involved.
|
|
+ *
|
|
+ * @return the loom inventory
|
|
+ */
|
|
+ @NotNull
|
|
+ public LoomInventory getLoomInventory() {
|
|
+ return loomInventory;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the pattern type selected.
|
|
+ *
|
|
+ * @return the pattern type
|
|
+ */
|
|
+ @NotNull
|
|
+ public PatternType getPatternType() {
|
|
+ return patternType;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the pattern type selected.
|
|
+ *
|
|
+ * @param patternType the pattern type
|
|
+ */
|
|
+ public void setPatternType(@NotNull PatternType patternType) {
|
|
+ this.patternType = patternType;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|