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
71 Zeilen
2.0 KiB
Diff
71 Zeilen
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Wed, 26 May 2021 17:08:57 -0400
|
|
Subject: [PATCH] Add BellRevealRaiderEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/block/BellRevealRaiderEvent.java b/src/main/java/io/papermc/paper/event/block/BellRevealRaiderEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..03dae5be7dba8ab550d03f365c05af4ba73e4224
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/block/BellRevealRaiderEvent.java
|
|
@@ -0,0 +1,58 @@
|
|
+package io.papermc.paper.event.block;
|
|
+
|
|
+import org.bukkit.block.Block;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.entity.Raider;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.block.BlockEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a {@link org.bukkit.entity.Raider} is revealed by a bell.
|
|
+ */
|
|
+public class BellRevealRaiderEvent extends BlockEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ private boolean cancelled = false;
|
|
+ private final Raider raider;
|
|
+
|
|
+ public BellRevealRaiderEvent(@NotNull Block theBlock, @NotNull Entity raider) {
|
|
+ super(theBlock);
|
|
+ this.raider = (Raider) raider;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the raider that the bell revealed.
|
|
+ *
|
|
+ * @return The raider
|
|
+ */
|
|
+ @NotNull
|
|
+ public Raider getEntity() {
|
|
+ return raider;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * {@inheritDoc}
|
|
+ * <p>
|
|
+ * This does not cancel the particle effects shown on the bell, only the entity.
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static @NotNull HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|