From dc841f3379881af6b25ccdbe2073a2bf5799f69a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 26 Jun 2019 01:31:26 +0100 Subject: [PATCH] Fix CME from raids Use the iterator to remove elements --- .../0407-Fix-CME-from-raids.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Spigot-Server-Patches/0407-Fix-CME-from-raids.patch diff --git a/Spigot-Server-Patches/0407-Fix-CME-from-raids.patch b/Spigot-Server-Patches/0407-Fix-CME-from-raids.patch new file mode 100644 index 0000000000..b7799bee1d --- /dev/null +++ b/Spigot-Server-Patches/0407-Fix-CME-from-raids.patch @@ -0,0 +1,23 @@ +From c846b7f9757ee1c83c7b4aa80c3b1a1458566e67 Mon Sep 17 00:00:00 2001 +From: Shane Freeder +Date: Wed, 26 Jun 2019 01:20:55 +0100 +Subject: [PATCH] Fix CME from raids + +Use the iterator to remove elements + +diff --git a/src/main/java/net/minecraft/server/Raid.java b/src/main/java/net/minecraft/server/Raid.java +index 6c1bbefd71..58c33f1000 100644 +--- a/src/main/java/net/minecraft/server/Raid.java ++++ b/src/main/java/net/minecraft/server/Raid.java +@@ -144,7 +144,7 @@ public class Raid { + BlockPosition blockposition = new BlockPosition(entityplayer); + + if (this.k.c_(blockposition) != this) { +- set.remove(entityplayer); ++ iterator.remove(); // Paper - Use iterator + this.r.removePlayer(entityplayer); + } + } +-- +2.22.0 +