mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
c0c212bf48
Upstream has released updates that appears to apply and compile correctly Paper Changes: b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads 3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495 e470f1ef Add more information to Timing Reports f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers a4fe910f Fix sounds when using worldedit regen command 70ad51a8 Updated Upstream (Bukkit/CraftBukkit) d7cfa4fa Improve legacy format serialization more
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From b1d25612377cabaa13d2283f99ecf369edb75d5e 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 427cfbb8b..e23565323 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 397baaefd..7456240b4 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
|
|
|