SPIGOT-7827: Sync EntityPortalEvent with PlayerPortalEvent since non-…

…players can now create portals
PaperMC · Jul 10, 2024 · bed1e3f · bed1e3f
1 parent 2444c8b
commit bed1e3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nms-patches/net/minecraft/world/entity/Entity.patch b/nms-patches/net/minecraft/world/entity/Entity.patch
@@ -861,7 +861,7 @@
 +        org.bukkit.entity.Entity bukkitEntity = entity.getBukkitEntity();
 +        Location enter = bukkitEntity.getLocation();
 +
-+        EntityPortalEvent event = new EntityPortalEvent(bukkitEntity, enter, exit, searchRadius);
++        EntityPortalEvent event = new EntityPortalEvent(bukkitEntity, enter, exit, searchRadius, true, creationRadius);
 +        event.getEntity().getServer().getPluginManager().callEvent(event);
 +        if (event.isCancelled() || event.getTo() == null || event.getTo().getWorld() == null || !entity.isAlive()) {
 +            return null;

diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftPortalEvent.java b/src/main/java/org/bukkit/craftbukkit/event/CraftPortalEvent.java
@@ -19,8 +19,8 @@ public CraftPortalEvent(EntityPortalEvent portalEvent) {
         to = portalEvent.getTo();
         searchRadius = portalEvent.getSearchRadius();
         cancelled = portalEvent.isCancelled();
-        creationRadius = 0;
-        canCreatePortal = false;
+        creationRadius = portalEvent.getCreationRadius();
+        canCreatePortal = portalEvent.getCanCreatePortal();
     }
 
     public CraftPortalEvent(PlayerPortalEvent portalEvent) {