From e8eb4bfee529498e807548f21df5525a1092f110 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 31 Jul 2018 15:16:12 -0500
Subject: [PATCH] Re-add GH-1286 fix for portals
Accidentally removed in 5311679c74d7ac351dbe2fad2851461e34088bb0
Also added to End Portals
---
.../0246-Call-PortalCreateEvent-for-exit-portals.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
index 130c881557..34274d578f 100644
--- a/Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
@@ -1,11 +1,11 @@
-From 45e58212dd6edf171819c56157f7fb32fa3ad617 Mon Sep 17 00:00:00 2001
+From aede0a63093907f88b869b485c595bf1c8cb1efe Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Sun, 18 Mar 2018 15:44:44 +0100
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
@@ -12,7 +12,7 @@ import org.bukkit.util.Vector;
@@ -22,7 +22,7 @@ index 402d8d7d63..8ef31e72a5 100644
byte b1 = 0;
+ java.util.Collection<org.bukkit.block.Block> bukkitBlocks = new java.util.HashSet<>(); // Paper
-+ java.util.Map<BlockPosition, IBlockData> nmsBlocks = new java.util.HashMap<>(); // Paper
++ java.util.Map<BlockPosition, IBlockData> 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<org.bukkit.block.Block> bukkitBlocks = new java.util.HashSet<>(); // Paper
-+ java.util.Map<BlockPosition, IBlockData> nmsBlocks = new java.util.HashMap<>(); // Paper
++ java.util.Map<BlockPosition, IBlockData> nmsBlocks = new java.util.LinkedHashMap<>(); // Paper
+
if (d0 < 0.0D) {
i1 = MathHelper.clamp(i1, 70, this.world.aa() - 10);