mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
4757060211
Upstream has released updates that appears to apply and compile correctly Paper Changes: df0d7b0d Update upstream CB 6ea3c2cf [CI-SKIP] Rebuild patches d7bed4cb Heavily optimise random block ticking (#2914) b66d9ff8 Update upstream CB ba71c5d6 Stop stripping private use block Unicode from signs 28d9dcfc Entity Jump API (#1587) 9976a768 Fix PlayerNaturallySpawnCreaturesEvent boolean inversion 054e20da Clean up imports on ThrownEggHatchEvent a8984ccb Add ThrownEggHatchEvent (#1982) 9f24d495 Allow nerfed blazes, endermen to take water damage (#2847)
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 59558c50dd67e0e2bc093f1f9b93e21a5c154fe3 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 19 Oct 2019 03:53:46 -0500
|
|
Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon
|
|
|
|
---
|
|
src/main/java/org/bukkit/PortalType.java | 7 +++++++
|
|
.../org/bukkit/event/entity/EntityCreatePortalEvent.java | 4 +---
|
|
2 files changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/main/java/org/bukkit/PortalType.java b/src/main/java/org/bukkit/PortalType.java
|
|
index 427cfbb8..e2356532 100644
|
|
--- a/src/main/java/org/bukkit/PortalType.java
|
|
+++ b/src/main/java/org/bukkit/PortalType.java
|
|
@@ -15,6 +15,13 @@ public enum PortalType {
|
|
*/
|
|
ENDER,
|
|
|
|
+ // Purpur start
|
|
+ /**
|
|
+ * This is an End Gateway portal
|
|
+ */
|
|
+ END_GATEWAY,
|
|
+ // Purpur end
|
|
+
|
|
/**
|
|
* This is a custom Plugin portal.
|
|
*/
|
|
diff --git a/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java b/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
|
|
index 397baaef..7456240b 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
|
|
@@ -11,10 +11,8 @@ import org.jetbrains.annotations.NotNull;
|
|
|
|
/**
|
|
* Thrown when a Living Entity creates a portal in a world.
|
|
- *
|
|
- * @deprecated Use {@link PortalCreateEvent}
|
|
*/
|
|
-@Deprecated
|
|
+// Purpur - un-deprecate
|
|
public class EntityCreatePortalEvent extends EntityEvent implements Cancellable {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private final List<BlockState> blocks;
|
|
--
|
|
2.24.0
|
|
|