mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
Optimize DataWatcher
Use primitive orientated collections, as well as more effective copies across collections.
This commit is contained in:
md_5
parent
704728d670
commit
ce85ede2bb
2 changed files with 476 additions and 1 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
From 82a65884167e21163253336d02fe1a176fe29f62 Mon Sep 17 00:00:00 2001
|
From 2993d045a90bcfeae07f067426b3c7017cea19de Mon Sep 17 00:00:00 2001
|
||||||
From: md_5 <md_5@live.com.au>
|
From: md_5 <md_5@live.com.au>
|
||||||
Date: Sun, 1 Dec 2013 15:10:48 +1100
|
Date: Sun, 1 Dec 2013 15:10:48 +1100
|
||||||
Subject: [PATCH] mc-dev imports
|
Subject: [PATCH] mc-dev imports
|
||||||
|
|
@ -406,6 +406,318 @@ index 0000000..6d5090b
|
||||||
+ return false;
|
+ return false;
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..90a2a80
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/main/java/net/minecraft/server/DataWatcher.java
|
||||||
|
@@ -0,0 +1,306 @@
|
||||||
|
+package net.minecraft.server;
|
||||||
|
+
|
||||||
|
+import java.util.ArrayList;
|
||||||
|
+import java.util.HashMap;
|
||||||
|
+import java.util.Iterator;
|
||||||
|
+import java.util.List;
|
||||||
|
+import java.util.Map;
|
||||||
|
+import java.util.concurrent.locks.ReadWriteLock;
|
||||||
|
+import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||||
|
+
|
||||||
|
+import net.minecraft.util.org.apache.commons.lang3.ObjectUtils;
|
||||||
|
+
|
||||||
|
+public class DataWatcher {
|
||||||
|
+
|
||||||
|
+ private final Entity a;
|
||||||
|
+ private boolean b = true;
|
||||||
|
+ private static final HashMap c = new HashMap();
|
||||||
|
+ private final Map d = new HashMap();
|
||||||
|
+ private boolean e;
|
||||||
|
+ private ReadWriteLock f = new ReentrantReadWriteLock();
|
||||||
|
+
|
||||||
|
+ public DataWatcher(Entity entity) {
|
||||||
|
+ this.a = entity;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void a(int i, Object object) {
|
||||||
|
+ Integer integer = (Integer) c.get(object.getClass());
|
||||||
|
+
|
||||||
|
+ if (integer == null) {
|
||||||
|
+ throw new IllegalArgumentException("Unknown data type: " + object.getClass());
|
||||||
|
+ } else if (i > 31) {
|
||||||
|
+ throw new IllegalArgumentException("Data value id is too big with " + i + "! (Max is " + 31 + ")");
|
||||||
|
+ } else if (this.d.containsKey(Integer.valueOf(i))) {
|
||||||
|
+ throw new IllegalArgumentException("Duplicate id value for " + i + "!");
|
||||||
|
+ } else {
|
||||||
|
+ WatchableObject watchableobject = new WatchableObject(integer.intValue(), i, object);
|
||||||
|
+
|
||||||
|
+ this.f.writeLock().lock();
|
||||||
|
+ this.d.put(Integer.valueOf(i), watchableobject);
|
||||||
|
+ this.f.writeLock().unlock();
|
||||||
|
+ this.b = false;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void a(int i, int j) {
|
||||||
|
+ WatchableObject watchableobject = new WatchableObject(j, i, null);
|
||||||
|
+
|
||||||
|
+ this.f.writeLock().lock();
|
||||||
|
+ this.d.put(Integer.valueOf(i), watchableobject);
|
||||||
|
+ this.f.writeLock().unlock();
|
||||||
|
+ this.b = false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public byte getByte(int i) {
|
||||||
|
+ return ((Byte) this.i(i).b()).byteValue();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public short getShort(int i) {
|
||||||
|
+ return ((Short) this.i(i).b()).shortValue();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public int getInt(int i) {
|
||||||
|
+ return ((Integer) this.i(i).b()).intValue();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public float getFloat(int i) {
|
||||||
|
+ return ((Float) this.i(i).b()).floatValue();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public String getString(int i) {
|
||||||
|
+ return (String) this.i(i).b();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public ItemStack getItemStack(int i) {
|
||||||
|
+ return (ItemStack) this.i(i).b();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ private WatchableObject i(int i) {
|
||||||
|
+ this.f.readLock().lock();
|
||||||
|
+
|
||||||
|
+ WatchableObject watchableobject;
|
||||||
|
+
|
||||||
|
+ try {
|
||||||
|
+ watchableobject = (WatchableObject) this.d.get(Integer.valueOf(i));
|
||||||
|
+ } catch (Throwable throwable) {
|
||||||
|
+ CrashReport crashreport = CrashReport.a(throwable, "Getting synched entity data");
|
||||||
|
+ CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Synched entity data");
|
||||||
|
+
|
||||||
|
+ crashreportsystemdetails.a("Data ID", Integer.valueOf(i));
|
||||||
|
+ throw new ReportedException(crashreport);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ this.f.readLock().unlock();
|
||||||
|
+ return watchableobject;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void watch(int i, Object object) {
|
||||||
|
+ WatchableObject watchableobject = this.i(i);
|
||||||
|
+
|
||||||
|
+ if (ObjectUtils.notEqual(object, watchableobject.b())) {
|
||||||
|
+ watchableobject.a(object);
|
||||||
|
+ this.a.i(i);
|
||||||
|
+ watchableobject.a(true);
|
||||||
|
+ this.e = true;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void h(int i) {
|
||||||
|
+ WatchableObject.a(this.i(i), true);
|
||||||
|
+ this.e = true;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public boolean a() {
|
||||||
|
+ return this.e;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public static void a(List list, PacketDataSerializer packetdataserializer) {
|
||||||
|
+ if (list != null) {
|
||||||
|
+ Iterator iterator = list.iterator();
|
||||||
|
+
|
||||||
|
+ while (iterator.hasNext()) {
|
||||||
|
+ WatchableObject watchableobject = (WatchableObject) iterator.next();
|
||||||
|
+
|
||||||
|
+ a(packetdataserializer, watchableobject);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ packetdataserializer.writeByte(127);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public List b() {
|
||||||
|
+ ArrayList arraylist = null;
|
||||||
|
+
|
||||||
|
+ if (this.e) {
|
||||||
|
+ this.f.readLock().lock();
|
||||||
|
+ Iterator iterator = this.d.values().iterator();
|
||||||
|
+
|
||||||
|
+ while (iterator.hasNext()) {
|
||||||
|
+ WatchableObject watchableobject = (WatchableObject) iterator.next();
|
||||||
|
+
|
||||||
|
+ if (watchableobject.d()) {
|
||||||
|
+ watchableobject.a(false);
|
||||||
|
+ if (arraylist == null) {
|
||||||
|
+ arraylist = new ArrayList();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ arraylist.add(watchableobject);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ this.f.readLock().unlock();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ this.e = false;
|
||||||
|
+ return arraylist;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void a(PacketDataSerializer packetdataserializer) {
|
||||||
|
+ this.f.readLock().lock();
|
||||||
|
+ Iterator iterator = this.d.values().iterator();
|
||||||
|
+
|
||||||
|
+ while (iterator.hasNext()) {
|
||||||
|
+ WatchableObject watchableobject = (WatchableObject) iterator.next();
|
||||||
|
+
|
||||||
|
+ a(packetdataserializer, watchableobject);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ this.f.readLock().unlock();
|
||||||
|
+ packetdataserializer.writeByte(127);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public List c() {
|
||||||
|
+ ArrayList arraylist = null;
|
||||||
|
+
|
||||||
|
+ this.f.readLock().lock();
|
||||||
|
+
|
||||||
|
+ WatchableObject watchableobject;
|
||||||
|
+
|
||||||
|
+ for (Iterator iterator = this.d.values().iterator(); iterator.hasNext(); arraylist.add(watchableobject)) {
|
||||||
|
+ watchableobject = (WatchableObject) iterator.next();
|
||||||
|
+ if (arraylist == null) {
|
||||||
|
+ arraylist = new ArrayList();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ this.f.readLock().unlock();
|
||||||
|
+ return arraylist;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ private static void a(PacketDataSerializer packetdataserializer, WatchableObject watchableobject) {
|
||||||
|
+ int i = (watchableobject.c() << 5 | watchableobject.a() & 31) & 255;
|
||||||
|
+
|
||||||
|
+ packetdataserializer.writeByte(i);
|
||||||
|
+ switch (watchableobject.c()) {
|
||||||
|
+ case 0:
|
||||||
|
+ packetdataserializer.writeByte(((Byte) watchableobject.b()).byteValue());
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 1:
|
||||||
|
+ packetdataserializer.writeShort(((Short) watchableobject.b()).shortValue());
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 2:
|
||||||
|
+ packetdataserializer.writeInt(((Integer) watchableobject.b()).intValue());
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 3:
|
||||||
|
+ packetdataserializer.writeFloat(((Float) watchableobject.b()).floatValue());
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 4:
|
||||||
|
+ try {
|
||||||
|
+ packetdataserializer.a((String) watchableobject.b());
|
||||||
|
+ } catch (java.io.IOException ex) {
|
||||||
|
+ throw new RuntimeException(ex);
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 5:
|
||||||
|
+ ItemStack itemstack = (ItemStack) watchableobject.b();
|
||||||
|
+
|
||||||
|
+ packetdataserializer.a(itemstack);
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 6:
|
||||||
|
+ ChunkCoordinates chunkcoordinates = (ChunkCoordinates) watchableobject.b();
|
||||||
|
+
|
||||||
|
+ packetdataserializer.writeInt(chunkcoordinates.x);
|
||||||
|
+ packetdataserializer.writeInt(chunkcoordinates.y);
|
||||||
|
+ packetdataserializer.writeInt(chunkcoordinates.z);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public static List b(PacketDataSerializer packetdataserializer) {
|
||||||
|
+ ArrayList arraylist = null;
|
||||||
|
+
|
||||||
|
+ for (byte b0 = packetdataserializer.readByte(); b0 != 127; b0 = packetdataserializer.readByte()) {
|
||||||
|
+ if (arraylist == null) {
|
||||||
|
+ arraylist = new ArrayList();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ int i = (b0 & 224) >> 5;
|
||||||
|
+ int j = b0 & 31;
|
||||||
|
+ WatchableObject watchableobject = null;
|
||||||
|
+
|
||||||
|
+ switch (i) {
|
||||||
|
+ case 0:
|
||||||
|
+ watchableobject = new WatchableObject(i, j, Byte.valueOf(packetdataserializer.readByte()));
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 1:
|
||||||
|
+ watchableobject = new WatchableObject(i, j, Short.valueOf(packetdataserializer.readShort()));
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 2:
|
||||||
|
+ watchableobject = new WatchableObject(i, j, Integer.valueOf(packetdataserializer.readInt()));
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 3:
|
||||||
|
+ watchableobject = new WatchableObject(i, j, Float.valueOf(packetdataserializer.readFloat()));
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 4:
|
||||||
|
+ try {
|
||||||
|
+ watchableobject = new WatchableObject(i, j, packetdataserializer.c(32767));
|
||||||
|
+ } catch (java.io.IOException ex) {
|
||||||
|
+ throw new RuntimeException(ex);
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 5:
|
||||||
|
+ watchableobject = new WatchableObject(i, j, packetdataserializer.c());
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case 6:
|
||||||
|
+ int k = packetdataserializer.readInt();
|
||||||
|
+ int l = packetdataserializer.readInt();
|
||||||
|
+ int i1 = packetdataserializer.readInt();
|
||||||
|
+
|
||||||
|
+ watchableobject = new WatchableObject(i, j, new ChunkCoordinates(k, l, i1));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ arraylist.add(watchableobject);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return arraylist;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public boolean d() {
|
||||||
|
+ return this.b;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void e() {
|
||||||
|
+ this.e = false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ static {
|
||||||
|
+ c.put(Byte.class, Integer.valueOf(0));
|
||||||
|
+ c.put(Short.class, Integer.valueOf(1));
|
||||||
|
+ c.put(Integer.class, Integer.valueOf(2));
|
||||||
|
+ c.put(Float.class, Integer.valueOf(3));
|
||||||
|
+ c.put(String.class, Integer.valueOf(4));
|
||||||
|
+ c.put(ItemStack.class, Integer.valueOf(5));
|
||||||
|
+ c.put(ChunkCoordinates.class, Integer.valueOf(6));
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
|
diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..06934a1
|
index 0000000..06934a1
|
||||||
|
|
@ -1136,6 +1448,56 @@ index 0000000..1eb87ae
|
||||||
+
|
+
|
||||||
+ protected abstract StructureStart b(int i, int j);
|
+ protected abstract StructureStart b(int i, int j);
|
||||||
+}
|
+}
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/WatchableObject.java b/src/main/java/net/minecraft/server/WatchableObject.java
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..678aa91
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/main/java/net/minecraft/server/WatchableObject.java
|
||||||
|
@@ -0,0 +1,44 @@
|
||||||
|
+package net.minecraft.server;
|
||||||
|
+
|
||||||
|
+public class WatchableObject {
|
||||||
|
+
|
||||||
|
+ private final int a;
|
||||||
|
+ private final int b;
|
||||||
|
+ private Object c;
|
||||||
|
+ private boolean d;
|
||||||
|
+
|
||||||
|
+ public WatchableObject(int i, int j, Object object) {
|
||||||
|
+ this.b = j;
|
||||||
|
+ this.c = object;
|
||||||
|
+ this.a = i;
|
||||||
|
+ this.d = true;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public int a() {
|
||||||
|
+ return this.b;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void a(Object object) {
|
||||||
|
+ this.c = object;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public Object b() {
|
||||||
|
+ return this.c;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public int c() {
|
||||||
|
+ return this.a;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public boolean d() {
|
||||||
|
+ return this.d;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void a(boolean flag) {
|
||||||
|
+ this.d = flag;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ static boolean a(WatchableObject watchableobject, boolean flag) {
|
||||||
|
+ return watchableobject.d = flag;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
diff --git a/src/main/java/net/minecraft/server/WorldGenPackedIce2.java b/src/main/java/net/minecraft/server/WorldGenPackedIce2.java
|
diff --git a/src/main/java/net/minecraft/server/WorldGenPackedIce2.java b/src/main/java/net/minecraft/server/WorldGenPackedIce2.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..c0db754
|
index 0000000..c0db754
|
||||||
|
|
|
||||||
113
CraftBukkit-Patches/0073-Optimize-DataWatcher.patch
Normal file
113
CraftBukkit-Patches/0073-Optimize-DataWatcher.patch
Normal file
|
|
@ -0,0 +1,113 @@
|
||||||
|
From 5121839a20fa4b458f7a22946b40923405568734 Mon Sep 17 00:00:00 2001
|
||||||
|
From: md_5 <git@md-5.net>
|
||||||
|
Date: Fri, 13 Dec 2013 11:45:47 +1100
|
||||||
|
Subject: [PATCH] Optimize DataWatcher
|
||||||
|
|
||||||
|
Use primitive orientated collections, as well as more effective copies across collections.
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
|
||||||
|
index 90a2a80..5402e5c 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/DataWatcher.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/DataWatcher.java
|
||||||
|
@@ -14,8 +14,8 @@ public class DataWatcher {
|
||||||
|
|
||||||
|
private final Entity a;
|
||||||
|
private boolean b = true;
|
||||||
|
- private static final HashMap c = new HashMap();
|
||||||
|
- private final Map d = new HashMap();
|
||||||
|
+ private static final gnu.trove.map.TObjectIntMap c = new gnu.trove.map.hash.TObjectIntHashMap(); // Spigot
|
||||||
|
+ private final gnu.trove.map.TIntObjectMap d = new gnu.trove.map.hash.TIntObjectHashMap(); // Spigot
|
||||||
|
private boolean e;
|
||||||
|
private ReadWriteLock f = new ReentrantReadWriteLock();
|
||||||
|
|
||||||
|
@@ -36,7 +36,7 @@ public class DataWatcher {
|
||||||
|
WatchableObject watchableobject = new WatchableObject(integer.intValue(), i, object);
|
||||||
|
|
||||||
|
this.f.writeLock().lock();
|
||||||
|
- this.d.put(Integer.valueOf(i), watchableobject);
|
||||||
|
+ this.d.put(i, watchableobject); // Spigot
|
||||||
|
this.f.writeLock().unlock();
|
||||||
|
this.b = false;
|
||||||
|
}
|
||||||
|
@@ -46,7 +46,7 @@ public class DataWatcher {
|
||||||
|
WatchableObject watchableobject = new WatchableObject(j, i, null);
|
||||||
|
|
||||||
|
this.f.writeLock().lock();
|
||||||
|
- this.d.put(Integer.valueOf(i), watchableobject);
|
||||||
|
+ this.d.put(i, watchableobject); // Spigot
|
||||||
|
this.f.writeLock().unlock();
|
||||||
|
this.b = false;
|
||||||
|
}
|
||||||
|
@@ -81,7 +81,7 @@ public class DataWatcher {
|
||||||
|
WatchableObject watchableobject;
|
||||||
|
|
||||||
|
try {
|
||||||
|
- watchableobject = (WatchableObject) this.d.get(Integer.valueOf(i));
|
||||||
|
+ watchableobject = (WatchableObject) this.d.get(i); // Spigot
|
||||||
|
} catch (Throwable throwable) {
|
||||||
|
CrashReport crashreport = CrashReport.a(throwable, "Getting synched entity data");
|
||||||
|
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Synched entity data");
|
||||||
|
@@ -133,7 +133,7 @@ public class DataWatcher {
|
||||||
|
|
||||||
|
if (this.e) {
|
||||||
|
this.f.readLock().lock();
|
||||||
|
- Iterator iterator = this.d.values().iterator();
|
||||||
|
+ Iterator iterator = this.d.valueCollection().iterator(); // Spigot
|
||||||
|
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
WatchableObject watchableobject = (WatchableObject) iterator.next();
|
||||||
|
@@ -157,7 +157,7 @@ public class DataWatcher {
|
||||||
|
|
||||||
|
public void a(PacketDataSerializer packetdataserializer) {
|
||||||
|
this.f.readLock().lock();
|
||||||
|
- Iterator iterator = this.d.values().iterator();
|
||||||
|
+ Iterator iterator = this.d.valueCollection().iterator(); // Spigot
|
||||||
|
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
WatchableObject watchableobject = (WatchableObject) iterator.next();
|
||||||
|
@@ -170,18 +170,11 @@ public class DataWatcher {
|
||||||
|
}
|
||||||
|
|
||||||
|
public List c() {
|
||||||
|
- ArrayList arraylist = null;
|
||||||
|
+ ArrayList arraylist = new ArrayList(); // Spigot
|
||||||
|
|
||||||
|
this.f.readLock().lock();
|
||||||
|
|
||||||
|
- WatchableObject watchableobject;
|
||||||
|
-
|
||||||
|
- for (Iterator iterator = this.d.values().iterator(); iterator.hasNext(); arraylist.add(watchableobject)) {
|
||||||
|
- watchableobject = (WatchableObject) iterator.next();
|
||||||
|
- if (arraylist == null) {
|
||||||
|
- arraylist = new ArrayList();
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
+ arraylist.addAll(this.d.valueCollection()); // Spigot
|
||||||
|
|
||||||
|
this.f.readLock().unlock();
|
||||||
|
return arraylist;
|
||||||
|
@@ -295,12 +288,14 @@ public class DataWatcher {
|
||||||
|
}
|
||||||
|
|
||||||
|
static {
|
||||||
|
- c.put(Byte.class, Integer.valueOf(0));
|
||||||
|
- c.put(Short.class, Integer.valueOf(1));
|
||||||
|
- c.put(Integer.class, Integer.valueOf(2));
|
||||||
|
- c.put(Float.class, Integer.valueOf(3));
|
||||||
|
- c.put(String.class, Integer.valueOf(4));
|
||||||
|
- c.put(ItemStack.class, Integer.valueOf(5));
|
||||||
|
- c.put(ChunkCoordinates.class, Integer.valueOf(6));
|
||||||
|
+ // Spigot Start - remove valueOf
|
||||||
|
+ c.put(Byte.class, 0);
|
||||||
|
+ c.put(Short.class, 1);
|
||||||
|
+ c.put(Integer.class, 2);
|
||||||
|
+ c.put(Float.class, 3);
|
||||||
|
+ c.put(String.class, 4);
|
||||||
|
+ c.put(ItemStack.class, 5);
|
||||||
|
+ c.put(ChunkCoordinates.class, 6);
|
||||||
|
+ // Spigot End
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
1.8.3.2
|
||||||
|
|
||||||
Loading…
Reference in a new issue