Update from upstream SpigotMC

44608631338 [M]
29dbaa783fe
edf691c2e93
da9bbdfaea9
330d66bfb62
This commit is contained in:
Zach Brown
2014-12-10 22:21:51 -06:00
parent 3ba06bf3ff
commit af1661e8d3
3 changed files with 6 additions and 6 deletions

View File

@@ -91,7 +91,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ extra = new int[]{ id };
+ } else
+ {
+ extra = new int[]{ (id << 4) | data };
+ extra = new int[]{ (data << 12) | (id & 0xFFF) };
+ }
+ }
+ break;
@@ -167,7 +167,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ extra = new int[]{ id };
+ } else
+ {
+ extra = new int[]{ (id << 4) | data };
+ extra = new int[]{ (data << 12) | (id & 0xFFF) };
+ }
+ }
+ break;