mirror of https://github.com/PaperMC/Paper.git
27 lines
1.5 KiB
Diff
27 lines
1.5 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:39 -0800
|
||
|
|
Subject: [PATCH] Improve PortalEvents
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
index 63e4fa54c6931a3fc33b081662823f5b736d8496..48103cefacf75a51619f7a3ebeb7731956a65a4f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -3513,7 +3513,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||
|
|
Location enter = bukkitEntity.getLocation();
|
||
|
Location exit = CraftLocation.toBukkit(exitPosition, exitWorldServer.getWorld());
|
||
|
|
|
||
|
|
- EntityPortalEvent event = new EntityPortalEvent(bukkitEntity, enter, exit, searchRadius);
|
||
|
|
+ // Paper start
|
||
|
|
+ final org.bukkit.PortalType portalType = switch (cause) {
|
||
|
|
+ case END_PORTAL -> org.bukkit.PortalType.ENDER;
|
||
|
|
+ case NETHER_PORTAL -> org.bukkit.PortalType.NETHER;
|
||
|
|
+ default -> org.bukkit.PortalType.CUSTOM;
|
||
|
|
+ };
|
||
|
|
+ EntityPortalEvent event = new EntityPortalEvent(bukkitEntity, enter, exit, searchRadius, portalType);
|
||
|
|
+ // Paper end
|
||
|
|
event.getEntity().getServer().getPluginManager().callEvent(event);
|
||
|
|
if (event.isCancelled() || event.getTo() == null || event.getTo().getWorld() == null || !entity.isAlive()) {
|
||
|
|
return null;
|