Update to Minecraft 1.10

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2016-06-09 11:43:49 +10:00
commit a39b7e5f3a
161 changed files with 1176 additions and 1147 deletions

View file

@ -9,7 +9,7 @@
}
public static int getCombinedId(IBlockData iblockdata) {
@@ -327,7 +327,8 @@
@@ -332,7 +332,8 @@
int j = this.getDropCount(i, world.random);
for (int k = 0; k < j; ++k) {
@ -19,7 +19,7 @@
Item item = this.getDropType(iblockdata, world.random, i);
if (item != null) {
@@ -863,7 +864,7 @@
@@ -873,7 +874,7 @@
if (hashset.contains(block16)) {
for (int i = 0; i < 15; ++i) {
@ -28,7 +28,7 @@
Block.REGISTRY_ID.a(block16.fromLegacyData(i), j);
}
@@ -872,7 +873,7 @@
@@ -882,7 +883,7 @@
while (iterator2.hasNext()) {
IBlockData iblockdata = (IBlockData) iterator2.next();
@ -37,7 +37,7 @@
Block.REGISTRY_ID.a(iblockdata, k);
}
@@ -881,6 +882,12 @@
@@ -891,6 +892,12 @@
}