mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 00:56:39 +01:00
ac554ad46d
Updated Upstream (Bukkit/CraftBukkit) 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: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
128 lines
4.8 KiB
Diff
128 lines
4.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Thu, 15 Dec 2022 10:33:34 -0800
|
|
Subject: [PATCH] Improve PortalEvents
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/entity/EntityPortalEvent.java b/src/main/java/org/bukkit/event/entity/EntityPortalEvent.java
|
|
index 67fb9d93e808e907fa980f3004d415ae5d0a53fc..97e36c7f6e09276fbae20eaeee0965566332ca46 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityPortalEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityPortalEvent.java
|
|
@@ -15,15 +15,58 @@ import org.jetbrains.annotations.Nullable;
|
|
public class EntityPortalEvent extends EntityTeleportEvent {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private int searchRadius = 128;
|
|
+ private final org.bukkit.PortalType type; // Paper
|
|
|
|
public EntityPortalEvent(@NotNull final Entity entity, @NotNull final Location from, @Nullable final Location to) {
|
|
- super(entity, from, to);
|
|
+ this(entity, from, to, 128); // Paper
|
|
}
|
|
|
|
public EntityPortalEvent(@NotNull Entity entity, @NotNull Location from, @Nullable Location to, int searchRadius) {
|
|
super(entity, from, to);
|
|
this.searchRadius = searchRadius;
|
|
+ this.type = org.bukkit.PortalType.CUSTOM; // Paper
|
|
+ }
|
|
+
|
|
+ // Paper start
|
|
+ public EntityPortalEvent(@NotNull Entity entity, @NotNull Location from, @Nullable Location to, int searchRadius, final @NotNull org.bukkit.PortalType portalType) {
|
|
+ super(entity, from, to);
|
|
+ this.searchRadius = searchRadius;
|
|
+ this.type = portalType;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the portal type relating to this event.
|
|
+ *
|
|
+ * @return the portal type
|
|
+ */
|
|
+ public @NotNull org.bukkit.PortalType getPortalType() {
|
|
+ return this.type;
|
|
+ }
|
|
+ /**
|
|
+ * For {@link org.bukkit.PortalType#NETHER}, this is initially just the starting point
|
|
+ * for the search for a portal to teleport to. It will initially just be the {@link #getFrom()}
|
|
+ * scaled for dimension scaling and clamped to be inside the world border.
|
|
+ * <p>
|
|
+ * For {@link org.bukkit.PortalType#ENDER}, this will initially be the exact destination
|
|
+ * either, the world spawn for <i>end->any world</i> or end spawn for <i>any world->end</i>.
|
|
+ *
|
|
+ * @return starting point for search or exact destination
|
|
+ */
|
|
+ @Override
|
|
+ public @Nullable Location getTo() {
|
|
+ return super.getTo();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * See the description of {@link #getTo()}.
|
|
+ * @param to starting point for search or exact destination
|
|
+ * or null to cancel
|
|
+ */
|
|
+ @Override
|
|
+ public void setTo(@Nullable final Location to) {
|
|
+ super.setTo(to);
|
|
}
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Set the Block radius to search in for available portals.
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java b/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
|
|
index 57eeeafae84f83a939925820e827769749ff27ec..929a997671de8202efb9da97fbf9b4a0bf7c37e8 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java
|
|
@@ -32,6 +32,53 @@ public class PlayerPortalEvent extends PlayerTeleportEvent {
|
|
this.canCreatePortal = canCreatePortal;
|
|
this.creationRadius = creationRadius;
|
|
}
|
|
+ // Paper start
|
|
+ /**
|
|
+ * For {@link TeleportCause#NETHER_PORTAL}, this is initially just the starting point
|
|
+ * for the search for a portal to teleport to. It will initially just be the {@link #getFrom()}
|
|
+ * scaled for dimension scaling and clamped to be inside the world border.
|
|
+ * <p>
|
|
+ * For {@link TeleportCause#END_PORTAL}, this will initially be the exact destination
|
|
+ * either, the world spawn for <i>end->any world</i> or end spawn for <i>any world->end</i>.
|
|
+ *
|
|
+ * @return starting point for search or exact destination
|
|
+ */
|
|
+ @Override
|
|
+ public @NotNull Location getTo() {
|
|
+ return super.getTo();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * See the description of {@link #getTo()}.
|
|
+ * @param to starting point for search or exact destination
|
|
+ */
|
|
+ @Override
|
|
+ public void setTo(@NotNull final Location to) {
|
|
+ super.setTo(to);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * No effect
|
|
+ * @return no effect
|
|
+ * @deprecated No effect
|
|
+ */
|
|
+ @Deprecated
|
|
+ @Override
|
|
+ public boolean willDismountPlayer() {
|
|
+ return super.willDismountPlayer();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * No effect
|
|
+ * @return no effect
|
|
+ * @deprecated No effect
|
|
+ */
|
|
+ @Deprecated
|
|
+ @Override
|
|
+ public @NotNull java.util.Set<io.papermc.paper.entity.TeleportFlag.@NotNull Relative> getRelativeTeleportationFlags() {
|
|
+ return super.getRelativeTeleportationFlags();
|
|
+ }
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Set the Block radius to search in for available portals.
|