Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,22 +0,0 @@
--- ../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);