summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntitySlice.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-05-14 12:00:00 +1000
committermd_5 <git@md-5.net>2017-05-14 12:00:00 +1000
commit5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 (patch)
tree0314ba59f51141bb5e0e7ff6ca7723d168ac94b9 /nms-patches/EntitySlice.patch
parent6e3cec8bc78269d72ef7ef49ce82a5eadfb9615a (diff)
downloadcraftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.gz
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.lz
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.tar.xz
craftbukkit-5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5.zip
Update to Minecraft 1.12-pre2
Diffstat (limited to 'nms-patches/EntitySlice.patch')
-rw-r--r--nms-patches/EntitySlice.patch15
1 files changed, 3 insertions, 12 deletions
diff --git a/nms-patches/EntitySlice.patch b/nms-patches/EntitySlice.patch
index 3f381048..2efa923f 100644
--- a/nms-patches/EntitySlice.patch
+++ b/nms-patches/EntitySlice.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntitySlice.java
+++ b/net/minecraft/server/EntitySlice.java
-@@ -12,7 +12,7 @@
+@@ -13,7 +13,7 @@
public class EntitySlice<T> extends AbstractSet<T> {
@@ -9,7 +9,7 @@
private final Map<Class<?>, List<T>> b = Maps.newHashMap();
private final Set<Class<?>> c = Sets.newIdentityHashSet();
private final Class<T> d;
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
Object object = iterator.next();
if (oclass.isAssignableFrom(object.getClass())) {
@@ -18,7 +18,7 @@
}
}
-@@ -77,7 +77,7 @@
+@@ -78,7 +78,7 @@
List list = (List) this.b.get(oclass);
if (list == null) {
@@ -27,12 +27,3 @@
} else {
list.add(t0);
}
-@@ -125,7 +125,7 @@
- }
-
- public Iterator<T> iterator() {
-- return this.e.isEmpty() ? Iterators.emptyIterator() : Iterators.unmodifiableIterator(this.e.iterator());
-+ return this.e.isEmpty() ? Iterators.<T>emptyIterator() : Iterators.unmodifiableIterator(this.e.iterator());
- }
-
- public int size() {