mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-01 00:10:32 +01:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
99 lines
2.8 KiB
Diff
99 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 8 May 2021 18:02:06 -0700
|
|
Subject: [PATCH] Add EntityInsideBlockEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..3e98db83060e614c606de41dcd4b4ac4f242edc9
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java
|
|
@@ -0,0 +1,86 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import org.bukkit.block.Block;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when an entity enters the hitbox of a block.
|
|
+ * Only called for blocks that react when an entity is inside.
|
|
+ * If cancelled, any action that would have resulted from that entity
|
|
+ * being in the block will not happen (such as extinguishing an entity in a cauldron).
|
|
+ * <p>
|
|
+ * Blocks this is currently called for:
|
|
+ * <ul>
|
|
+ * <li>Big dripleaf</li>
|
|
+ * <li>Bubble column</li>
|
|
+ * <li>Buttons</li>
|
|
+ * <li>Cactus</li>
|
|
+ * <li>Campfire</li>
|
|
+ * <li>Cauldron</li>
|
|
+ * <li>Crops</li>
|
|
+ * <li>Ender Portal</li>
|
|
+ * <li>Fires</li>
|
|
+ * <li>Frogspawn</li>
|
|
+ * <li>Honey</li>
|
|
+ * <li>Hopper</li>
|
|
+ * <li>Detector rails</li>
|
|
+ * <li>Nether portals</li>
|
|
+ * <li>Pitcher crop</li>
|
|
+ * <li>Powdered snow</li>
|
|
+ * <li>Pressure plates</li>
|
|
+ * <li>Sweet berry bush</li>
|
|
+ * <li>Tripwire</li>
|
|
+ * <li>Waterlily</li>
|
|
+ * <li>Web</li>
|
|
+ * <li>Wither rose</li>
|
|
+ * </ul>
|
|
+ */
|
|
+public class EntityInsideBlockEvent extends EntityEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private final Block block;
|
|
+ private boolean cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public EntityInsideBlockEvent(@NotNull Entity entity, @NotNull Block block) {
|
|
+ super(entity);
|
|
+ this.block = block;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the block.
|
|
+ *
|
|
+ * @return the block
|
|
+ */
|
|
+ @NotNull
|
|
+ public Block getBlock() {
|
|
+ return this.block;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.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;
|
|
+ }
|
|
+}
|