From e3bbc0d3ec4f56383d34c385da47b9bf83abd938 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Wed, 30 Sep 2020 21:12:34 +0200
Subject: [PATCH] Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
5da21f87 SPIGOT-6152: End exit gates in custom ends do not send back to overworld
1ee373fe SPIGOT-6157: Crash when PortalCreateEvent cancelled
---
 ...xception-when-cancelling-PortalCreat.patch | 40 -------------------
 work/CraftBukkit                              |  2 +-
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 Spigot-Server-Patches/Fix-block-data-exception-when-cancelling-PortalCreat.patch

diff --git a/Spigot-Server-Patches/Fix-block-data-exception-when-cancelling-PortalCreat.patch b/Spigot-Server-Patches/Fix-block-data-exception-when-cancelling-PortalCreat.patch
deleted file mode 100644
index d03a218bb4..0000000000
--- a/Spigot-Server-Patches/Fix-block-data-exception-when-cancelling-PortalCreat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Thu, 10 Sep 2020 09:00:02 +0100
-Subject: [PATCH] Fix block data exception when cancelling PortalCreateEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-             Optional<BlockUtil.Rectangle> optional1 = worldserver.getTravelAgent().createPortal(blockposition, enumdirection_enumaxis, this, createRadius); // CraftBukkit
- 
-             if (!optional1.isPresent()) {
--                EntityPlayer.LOGGER.error("Unable to create a portal, likely target out of worldborder");
-+                //EntityPlayer.LOGGER.error("Unable to create a portal, likely target out of worldborder"); // Paper
-             }
- 
-             return optional1;
-diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
-+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-@@ -0,0 +0,0 @@ public class PortalTravelAgent {
-             EnumDirection enumdirection1 = enumdirection.g();
- 
-             if (!worldborder.a(blockposition1)) {
-+                MinecraftServer.LOGGER.error("Unable to create a portal, likely target out of worldborder"); // Paper - restore this message
-                 return Optional.empty();
-             }
- 
-@@ -0,0 +0,0 @@ public class PortalTravelAgent {
-         this.world.getServer().getPluginManager().callEvent(event);
-         if (!event.isCancelled()) {
-             blockList.updateList();
--        }
-+        } else return Optional.empty(); // Paper
-         // CraftBukkit end
-         return Optional.of(new BlockUtil.Rectangle(blockposition1.immutableCopy(), 2, 3));
-     }
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a339310c48..5da21f87d6 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a339310c48548f0f82f923ff3f5fe2cdc7a8e8ba
+Subproject commit 5da21f87d6b0953f73941e68f5a09dc473d7cd5e