summaryrefslogtreecommitdiffstats
path: root/nms-patches/DataWatcher.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-06-25 11:54:17 +1000
committermd_5 <git@md-5.net>2016-06-25 11:54:17 +1000
commit75f99ec7c5c3d7281d73f03d79e3339abcb59faa (patch)
tree7e37819d14923bb7d3fde7fa8461c1a04a432099 /nms-patches/DataWatcher.patch
parent1953f52da1ece0feb56dea20592c1b86616b31a5 (diff)
downloadcraftbukkit-75f99ec7c5c3d7281d73f03d79e3339abcb59faa.tar
craftbukkit-75f99ec7c5c3d7281d73f03d79e3339abcb59faa.tar.gz
craftbukkit-75f99ec7c5c3d7281d73f03d79e3339abcb59faa.tar.lz
craftbukkit-75f99ec7c5c3d7281d73f03d79e3339abcb59faa.tar.xz
craftbukkit-75f99ec7c5c3d7281d73f03d79e3339abcb59faa.zip
Update to Minecraft 1.10.2
Diffstat (limited to 'nms-patches/DataWatcher.patch')
-rw-r--r--nms-patches/DataWatcher.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/DataWatcher.patch b/nms-patches/DataWatcher.patch
index 251f284c..131d78a7 100644
--- a/nms-patches/DataWatcher.patch
+++ b/nms-patches/DataWatcher.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/DataWatcher.java
+++ b/net/minecraft/server/DataWatcher.java
-@@ -55,7 +55,7 @@
+@@ -70,7 +70,7 @@
}
}
@@ -9,7 +9,7 @@
int i = datawatcherobject.a();
if (i > 254) {
-@@ -69,7 +69,7 @@
+@@ -84,7 +84,7 @@
}
}
@@ -17,4 +17,4 @@
+ private <T> void registerObject(DataWatcherObject<T> datawatcherobject, Object t0) { // CraftBukkit Object
DataWatcher.Item datawatcher_item = new DataWatcher.Item(datawatcherobject, t0);
- this.d.writeLock().lock();
+ this.e.writeLock().lock();