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
parent 604d9373c0
commit a39b7e5f3a
161 changed files with 1176 additions and 1147 deletions

View File

@@ -20,7 +20,7 @@
if (this.c > 0) {
--this.c;
}
@@ -65,6 +72,16 @@
@@ -68,6 +75,16 @@
}
if (this.targetPlayer != null) {
@@ -34,10 +34,10 @@
+ }
+
+ if (!cancelled && targetPlayer != null) {
double d1 = (this.targetPlayer.locX - this.locX) / d0;
double d2 = (this.targetPlayer.locY + (double) this.targetPlayer.getHeadHeight() / 2.0D - this.locY) / d0;
double d3 = (this.targetPlayer.locZ - this.locZ) / d0;
@@ -77,6 +94,8 @@
double d1 = (this.targetPlayer.locX - this.locX) / 8.0D;
double d2 = (this.targetPlayer.locY + (double) this.targetPlayer.getHeadHeight() / 2.0D - this.locY) / 8.0D;
double d3 = (this.targetPlayer.locZ - this.locZ) / 8.0D;
@@ -80,6 +97,8 @@
this.motY += d2 / d4 * d5 * 0.1D;
this.motZ += d3 / d4 * d5 * 0.1D;
}
@@ -46,7 +46,7 @@
}
this.move(this.motX, this.motY, this.motZ);
@@ -151,7 +170,7 @@
@@ -154,7 +173,7 @@
}
if (this.value > 0) {
@@ -55,7 +55,7 @@
}
this.die();
@@ -173,6 +192,24 @@
@@ -176,6 +195,24 @@
}
public static int getOrbValue(int i) {