summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockEnderPortal.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/BlockEnderPortal.patch')
-rw-r--r--nms-patches/BlockEnderPortal.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/nms-patches/BlockEnderPortal.patch b/nms-patches/BlockEnderPortal.patch
new file mode 100644
index 00000000..ae5743c2
--- /dev/null
+++ b/nms-patches/BlockEnderPortal.patch
@@ -0,0 +1,22 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/BlockEnderPortal.java 2014-11-27 08:59:46.529422604 +1100
++++ src/main/java/net/minecraft/server/BlockEnderPortal.java 2014-11-27 08:42:10.104851005 +1100
+@@ -3,6 +3,8 @@
+ import java.util.List;
+ import java.util.Random;
+
++import org.bukkit.event.entity.EntityPortalEnterEvent; // CraftBukkit
++
+ public class BlockEnderPortal extends BlockContainer {
+
+ protected BlockEnderPortal(Material material) {
+@@ -36,6 +38,10 @@
+
+ public void a(World world, BlockPosition blockposition, IBlockData iblockdata, Entity entity) {
+ if (entity.vehicle == null && entity.passenger == null && !world.isStatic) {
++ // 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);
++ // CraftBukkit end
+ entity.c(1);
+ }
+