2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/BlockEnderPortal.java
|
|
|
|
+++ b/net/minecraft/server/BlockEnderPortal.java
|
2019-04-26 10:03:32 +02:00
|
|
|
@@ -1,5 +1,10 @@
|
2019-04-23 04:00:00 +02:00
|
|
|
package net.minecraft.server;
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2019-04-26 10:03:32 +02:00
|
|
|
+// CraftBukkit start
|
|
|
|
+import org.bukkit.event.entity.EntityPortalEnterEvent;
|
|
|
|
+import org.bukkit.event.player.PlayerTeleportEvent;
|
|
|
|
+// CraftBukkit end
|
2014-11-25 22:32:16 +01:00
|
|
|
+
|
2016-02-29 22:32:46 +01:00
|
|
|
public class BlockEnderPortal extends BlockTileEntity {
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2018-07-15 02:00:00 +02:00
|
|
|
protected static final VoxelShape a = Block.a(0.0D, 0.0D, 0.0D, 16.0D, 12.0D, 16.0D);
|
2020-07-05 01:00:43 +02:00
|
|
|
@@ -25,9 +30,18 @@
|
|
|
|
WorldServer worldserver = ((WorldServer) world).getMinecraftServer().getWorldServer(resourcekey);
|
|
|
|
|
|
|
|
if (worldserver == null) {
|
|
|
|
- return;
|
|
|
|
+ // return; // CraftBukkit - always fire event in case plugins wish to change it
|
2020-06-25 02:00:00 +02:00
|
|
|
}
|
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start - Entity in portal
|
|
|
|
+ EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), blockposition.getX(), blockposition.getY(), blockposition.getZ()));
|
|
|
|
+ world.getServer().getPluginManager().callEvent(event);
|
2019-04-26 10:03:32 +02:00
|
|
|
+
|
|
|
|
+ if (entity instanceof EntityPlayer) {
|
2020-08-11 23:00:00 +02:00
|
|
|
+ ((EntityPlayer) entity).b(worldserver, PlayerTeleportEvent.TeleportCause.END_PORTAL);
|
2019-04-26 10:03:32 +02:00
|
|
|
+ return;
|
|
|
|
+ }
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit end
|
2020-08-11 23:00:00 +02:00
|
|
|
entity.b(worldserver);
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|