From 1e737abf13c0336f11f0761fc779aa6c14ae8cdb Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Tue, 31 Jul 2018 15:16:12 -0500 Subject: [PATCH] Re-add GH-1286 fix for portals Accidentally removed in 897d804c62c5c643e775827d033fc90c043130c6 Also added to End Portals --- .../Call-PortalCreateEvent-for-exit-portals.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch index c5b964fa2b..1b64618e75 100644 --- a/Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch +++ b/Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Call PortalCreateEvent for exit portals diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index 402d8d7d63..8ef31e72a5 100644 +index 402d8d7d6..ba8d15431 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -0,0 +0,0 @@ import org.bukkit.util.Vector; @@ -22,7 +22,7 @@ index 402d8d7d63..8ef31e72a5 100644 byte b1 = 0; + java.util.Collection bukkitBlocks = new java.util.HashSet<>(); // Paper -+ java.util.Map nmsBlocks = new java.util.HashMap<>(); // Paper ++ java.util.Map nmsBlocks = new java.util.LinkedHashMap<>(); // Paper + for (int l = -2; l <= 2; ++l) { for (int i1 = -2; i1 <= 2; ++i1) { @@ -56,7 +56,7 @@ index 402d8d7d63..8ef31e72a5 100644 } + java.util.Collection bukkitBlocks = new java.util.HashSet<>(); // Paper -+ java.util.Map nmsBlocks = new java.util.HashMap<>(); // Paper ++ java.util.Map nmsBlocks = new java.util.LinkedHashMap<>(); // Paper + if (d0 < 0.0D) { i1 = MathHelper.clamp(i1, 70, this.world.aa() - 10);