mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 11:42:55 +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
106 lines
3.4 KiB
Diff
106 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Wed, 12 May 2021 04:30:53 -0700
|
|
Subject: [PATCH] Add EntityPortalReadyEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/entity/EntityPortalReadyEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityPortalReadyEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..3450735c86a8af45491c010a796262ae892f14dc
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityPortalReadyEvent.java
|
|
@@ -0,0 +1,94 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import org.bukkit.PortalType;
|
|
+import org.bukkit.World;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.bukkit.event.entity.EntityPortalEvent;
|
|
+import org.bukkit.event.player.PlayerPortalEvent;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Called when an entity is ready to be teleported by a plugin.
|
|
+ * Currently this is only called after the required
|
|
+ * ticks have passed for a Nether Portal.
|
|
+ * <p>
|
|
+ * Cancelling this event resets the entity's readiness
|
|
+ * regarding the current portal.
|
|
+ */
|
|
+public class EntityPortalReadyEvent extends EntityEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private final PortalType portalType;
|
|
+ private World targetWorld;
|
|
+
|
|
+ private boolean cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public EntityPortalReadyEvent(final @NotNull Entity entity, final @Nullable World targetWorld, final @NotNull PortalType portalType) {
|
|
+ super(entity);
|
|
+ this.targetWorld = targetWorld;
|
|
+ this.portalType = portalType;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the world this portal will teleport to.
|
|
+ * Can be {@code null} if "allow-nether" is false in server.properties
|
|
+ * or if there is another situation where there is no world to teleport to.
|
|
+ * <p>
|
|
+ * This world may be modified by later events such as {@link PlayerPortalEvent}
|
|
+ * or {@link EntityPortalEvent}.
|
|
+ *
|
|
+ * @return the world the portal will teleport the entity to.
|
|
+ */
|
|
+ public @Nullable World getTargetWorld() {
|
|
+ return this.targetWorld;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the world this portal will teleport to. A {@code null} value
|
|
+ * will essentially cancel the teleport and prevent further events
|
|
+ * such as {@link PlayerPortalEvent} from firing.
|
|
+ * <p>
|
|
+ * This world may be modified by later events such as {@link PlayerPortalEvent}
|
|
+ * or {@link EntityPortalEvent}.
|
|
+ *
|
|
+ * @param targetWorld the world
|
|
+ */
|
|
+ public void setTargetWorld(final @Nullable World targetWorld) {
|
|
+ this.targetWorld = targetWorld;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the portal type for this event.
|
|
+ *
|
|
+ * @return the portal type
|
|
+ */
|
|
+ public @NotNull PortalType getPortalType() {
|
|
+ return this.portalType;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(final boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ public static @NotNull HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|