mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Fix ConcurrentModificationException that occurred when reactor explodes.

Browse Source 
CraftBukket's HumanEntity.closeInventory() apparently removes the human
from the inventory's viewer list, resulting in an exception when we were
calling closeInventory while iterating over the list of said viewers.

Fixes TheBusyBiscuit/Slimefun4#364.
This commit is contained in:
David Kirchner 2017-10-08 19:43:45 -07:00
parent 5dd53540ee
commit 393b4835d9
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/me/mrCookieSlime/Slimefun/api/BlockStorage.java
View File

@ -1,8 +1,10 @@
package me.mrCookieSlime.Slimefun.api; package me.mrCookieSlime.Slimefun.api;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -415,11 +417,7 @@ public class BlockStorage {
if (destroy) { if (destroy) {
if (storage.hasInventory(l)) storage.clearInventory(l); if (storage.hasInventory(l)) storage.clearInventory(l);
if (storage.hasUniversalInventory(l)) { if (storage.hasUniversalInventory(l)) {
UniversalBlockMenu menu = storage.getUniversalInventory(l); storage.getUniversalInventory(l).close();
for (HumanEntity n: menu.toInventory().getViewers()) {
n.closeInventory();
}
storage.getUniversalInventory(l).save(); storage.getUniversalInventory(l).save();
} }
if (ticking_chunks.containsKey(l.getChunk().toString())) { if (ticking_chunks.containsKey(l.getChunk().toString())) {
@ -552,8 +550,9 @@ public class BlockStorage {
public void clearInventory(Location l) { public void clearInventory(Location l) {
BlockMenu menu = getInventory(l); BlockMenu menu = getInventory(l);
for (HumanEntity n: menu.toInventory().getViewers()) {
n.closeInventory(); for(HumanEntity human: new ArrayList<>(menu.toInventory().getViewers())) {
human.closeInventory();
} }
inventories.get(l).delete(l); inventories.get(l).delete(l);

7
src/me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java
View File

@ -1,7 +1,8 @@
package me.mrCookieSlime.Slimefun.api.inventory; package me.mrCookieSlime.Slimefun.api.inventory;
import java.io.File; import java.io.File;
import java.util.Iterator; import java.util.ArrayList;
import java.util.List;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -131,9 +132,7 @@ public class BlockMenu extends ChestMenu {
} }
public void close() { public void close() {
Iterator<HumanEntity> iterator = toInventory().getViewers().iterator(); for(HumanEntity human: new ArrayList<>(toInventory().getViewers())) {
while (iterator.hasNext()) {
HumanEntity human = iterator.next();
human.closeInventory(); human.closeInventory();
} }
} }

4
src/me/mrCookieSlime/Slimefun/api/inventory/UniversalBlockMenu.java
View File

@ -1,6 +1,8 @@
package me.mrCookieSlime.Slimefun.api.inventory; package me.mrCookieSlime.Slimefun.api.inventory;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import java.util.List;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu;
@ -89,7 +91,7 @@ public class UniversalBlockMenu extends ChestMenu {
} }
public void close() { public void close() {
for (HumanEntity human: toInventory().getViewers()) { for(HumanEntity human: new ArrayList<>(toInventory().getViewers())) {
human.closeInventory(); human.closeInventory();
} }
} }