2022-12-17 18:36:02 +01:00
|
|
|
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
|
2024-06-17 00:48:38 +02:00
|
|
|
index 4d70a5fd3cc6473942c9542a7f2a61edbc00b661..9058e5cd8ef661d59e93e82a3222506a13d0b1f4 100644
|
2022-12-17 18:36:02 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2024-06-17 00:48:38 +02:00
|
|
|
@@ -3529,7 +3529,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
2024-06-14 05:41:44 +02:00
|
|
|
org.bukkit.entity.Entity bukkitEntity = entity.getBukkitEntity();
|
2022-12-17 18:36:02 +01:00
|
|
|
Location enter = bukkitEntity.getLocation();
|
|
|
|
|
|
|
|
|
|
- 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;
|
