Update to 1.8.4

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-05-05 21:43:47 +01:00
parent ed8ca79a65
commit 38b1bb1aef
24 changed files with 270 additions and 287 deletions

View File

@@ -1,5 +1,5 @@
--- /home/matt/mc-dev-private//net/minecraft/server/PortalTravelAgent.java 2015-04-16 21:22:47.467439143 +0100
+++ src/main/java/net/minecraft/server/PortalTravelAgent.java 2015-04-16 21:22:47.471439143 +0100
--- /home/matt/mc-dev-private//net/minecraft/server/PortalTravelAgent.java 2015-05-05 21:41:21.188631097 +0100
+++ src/main/java/net/minecraft/server/PortalTravelAgent.java 2015-05-05 21:41:21.188631097 +0100
@@ -5,6 +5,12 @@
import java.util.List;
import java.util.Random;
@@ -141,7 +141,7 @@
double d2 = (double) ((BlockPosition) object).getX() + 0.5D;
double d3 = (double) ((BlockPosition) object).getY() + 0.5D;
@@ -134,26 +223,60 @@
@@ -132,26 +221,60 @@
f3 = -1.0F;
f4 = 1.0F;
}
@@ -216,7 +216,7 @@
int l = i;
int i1 = j;
int j1 = k;
@@ -178,10 +301,10 @@
@@ -176,10 +299,10 @@
double d4;
for (i2 = i - b0; i2 <= i + b0; ++i2) {
@@ -229,7 +229,7 @@
label271:
for (k2 = this.a.V() - 1; k2 >= 0; --k2) {
@@ -213,7 +336,7 @@
@@ -211,7 +334,7 @@
}
}
@@ -238,7 +238,7 @@
d4 = d1 * d1 + d3 * d3 + d2 * d2;
if (d0 < 0.0D || d4 < d0) {
d0 = d4;
@@ -230,10 +353,10 @@
@@ -228,10 +351,10 @@
if (d0 < 0.0D) {
for (i2 = i - b0; i2 <= i + b0; ++i2) {
@@ -251,7 +251,7 @@
label219:
for (k2 = this.a.V() - 1; k2 >= 0; --k2) {
@@ -258,7 +381,7 @@
@@ -256,7 +379,7 @@
}
}