geforkt von Mirrors/Paper
c0936a71bd
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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
102 Zeilen
3.4 KiB
Diff
102 Zeilen
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..3c6c1d7e97a0c9813bbc585fd209cc63f498e0d4
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityPortalReadyEvent.java
|
|
@@ -0,0 +1,89 @@
|
|
+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.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 World targetWorld;
|
|
+ private final PortalType portalType;
|
|
+ private boolean cancelled;
|
|
+
|
|
+ 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 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 org.bukkit.event.player.PlayerPortalEvent}
|
|
+ * or {@link org.bukkit.event.entity.EntityPortalEvent}.
|
|
+ *
|
|
+ * @return the world the portal will teleport the entity to.
|
|
+ */
|
|
+ public @Nullable World getTargetWorld() {
|
|
+ return targetWorld;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the world this portal will teleport to. A null value
|
|
+ * will essentially cancel the teleport and prevent further events
|
|
+ * such as {@link org.bukkit.event.player.PlayerPortalEvent} from firing.
|
|
+ * <p>
|
|
+ * This world may be modified by later events such as {@link org.bukkit.event.player.PlayerPortalEvent}
|
|
+ * or {@link org.bukkit.event.entity.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 portalType;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return 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;
|
|
+ }
|
|
+}
|