Merge branch 'MC1.7' of https://github.com/LemADEC/WarpDrive into MC1.7

This commit is contained in:
LemADEC 2016-02-29 23:27:53 +01:00
commit 8ec8565e76

View file

@ -470,8 +470,8 @@ public class EntityJump extends Entity {
distance = 0;
if (!isInSpace && !isInHyperSpace) {
String msg = "Unable to reach hyperspace from a planet";
killEntity(msg);
messageToAllPlayersOnShip(msg);
killEntity(msg);
LocalProfiler.stop();
return;
}
@ -1375,4 +1375,4 @@ public class EntityJump extends Entity {
Double.valueOf(posX), Double.valueOf(posY), Double.valueOf(posZ),
Integer.valueOf(ticks));
}
}
}