From 0c575603338bdcde6e2eba41152694da103a3865 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 28 Jun 2019 16:54:54 +1000
Subject: [PATCH] SPIGOT-5101: Raids crash

---
 nms-patches/Raid.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 nms-patches/Raid.patch

diff --git a/nms-patches/Raid.patch b/nms-patches/Raid.patch
new file mode 100644
index 0000000000..75c2ea0dcf
--- /dev/null
+++ b/nms-patches/Raid.patch
@@ -0,0 +1,19 @@
+--- a/net/minecraft/server/Raid.java
++++ b/net/minecraft/server/Raid.java
+@@ -137,14 +137,14 @@
+     private void y() {
+         Collection<EntityPlayer> collection = this.r.getPlayers();
+         Set<EntityPlayer> set = Sets.newHashSet(collection);
+-        Iterator iterator = collection.iterator();
++        Iterator iterator = set.iterator(); // CraftBukkit
+ 
+         while (iterator.hasNext()) {
+             EntityPlayer entityplayer = (EntityPlayer) iterator.next();
+             BlockPosition blockposition = new BlockPosition(entityplayer);
+ 
+             if (this.k.c_(blockposition) != this) {
+-                set.remove(entityplayer);
++                iterator.remove(); // CraftBukkit
+                 this.r.removePlayer(entityplayer);
+             }
+         }