summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntitySlice.patch
blob: 5e898280ded3c7125c4c93962000457456ec6a00 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
--- ../work/decompile-8eb82bde/net/minecraft/server/EntitySlice.java	2015-02-20 10:18:42.025023871 +0000
+++ src/main/java/net/minecraft/server/EntitySlice.java	2015-02-20 10:18:42.057023871 +0000
@@ -4,6 +4,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import java.util.AbstractSet;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.Set;
 import org.apache.commons.lang3.ClassUtils;
@@ -89,6 +90,11 @@
     }
 
     public Iterator iterator() {
+        // CraftBukkit start
+        if (!this.a.containsKey(this.c)) {
+            return Collections.EMPTY_LIST.iterator();
+        }
+        // CraftBukkit end
         Iterator iterator = this.a.get(this.c).iterator();
 
         return new EntitySliceInnerClass2(this, iterator);