mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 12:27:59 +01:00
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
93 lines
2.6 KiB
Diff
93 lines
2.6 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..94e8b6f6501c92711bd0bc9ee0f67e28f85a605f
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityInsideBlockEvent.java
|
|
@@ -0,0 +1,80 @@
|
|
+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.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>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>Honey</li>
|
|
+ * <li>Hopper</li>
|
|
+ * <li>Detector rails</li>
|
|
+ * <li>Nether portals</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;
|
|
+
|
|
+ public EntityInsideBlockEvent(@NotNull Entity entity, @NotNull Block block) {
|
|
+ super(entity);
|
|
+ this.block = block;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the block.
|
|
+ *
|
|
+ * @return the block
|
|
+ */
|
|
+ @NotNull
|
|
+ public Block getBlock() {
|
|
+ return block;
|
|
+ }
|
|
+
|
|
+ @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;
|
|
+ }
|
|
+}
|