Block minecart portal teleports in some instances
Mitigates GH-373 Technically a workaround rather than a true fix
This commit is contained in:
parent
2b244fb51e
commit
eb3ff14afd
1 changed files with 13 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
|||
From c87534e092cff7992c0f4e96f9c6f2567cea4fd4 Mon Sep 17 00:00:00 2001
|
||||
From f4c96964d2f893ecac513c8759c888a36395424d Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@outlook.com>
|
||||
Date: Sat, 18 Jun 2016 01:01:37 -0500
|
||||
Subject: [PATCH] Make entities look for hoppers
|
||||
|
@ -103,6 +103,18 @@ index 8c64279..4445ae7 100644
|
|||
public boolean b(AxisAlignedBB axisalignedbb) {
|
||||
return this.a(axisalignedbb.a, axisalignedbb.b, axisalignedbb.c, axisalignedbb.d, axisalignedbb.e, axisalignedbb.f);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
|
||||
index 88d267c..803019a 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockPortal.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
|
||||
@@ -114,6 +114,7 @@ public class BlockPortal extends BlockHalfTransparent {
|
||||
|
||||
public void a(World world, BlockPosition blockposition, IBlockData iblockdata, Entity entity) {
|
||||
if (!entity.isPassenger() && !entity.isVehicle() && entity.aX()) {
|
||||
+ if (entity.getWorld().paperConfig.isHopperPushBased && entity instanceof EntityMinecartAbstract) return; // Paper - Mitigates GH-373
|
||||
// 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);
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
||||
index d6cc51b..5bbaa87 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
||||
|
|
Loading…
Reference in a new issue