Update to Minecraft 1.11

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-11-17 12:41:03 +11:00
parent 49bc1c57f9
commit 4e412ab4e3
279 changed files with 3722 additions and 2992 deletions

View File

@@ -17,8 +17,8 @@
private static final DataWatcherObject<Integer> a = DataWatcher.a(EntityMinecartAbstract.class, DataWatcherRegistry.b);
@@ -23,6 +32,17 @@
private double ax;
private double ay;
private double az;
+ // CraftBukkit start
+ public boolean slowWhenEmpty = true;
@@ -79,10 +79,10 @@
this.az();
if (flag && !this.hasCustomName()) {
this.die();
@@ -150,6 +194,14 @@
@@ -146,6 +190,14 @@
}
public void m() {
public void A_() {
+ // CraftBukkit start
+ double prevX = this.locX;
+ double prevY = this.locY;
@@ -94,16 +94,16 @@
if (this.getType() > 0) {
this.d(this.getType() - 1);
}
@@ -170,7 +222,7 @@
@@ -166,7 +218,7 @@
i = this.V();
if (this.al) {
if (this.ak) {
- if (minecraftserver.getAllowNether()) {
+ if (true || minecraftserver.getAllowNether()) { // CraftBukkit - multi-world should still allow teleport even if default vanilla nether disabled
if (!this.isPassenger() && this.am++ >= i) {
this.am = i;
if (!this.isPassenger() && this.al++ >= i) {
this.al = i;
this.portalCooldown = this.aE();
@@ -270,6 +322,18 @@
@@ -266,6 +318,18 @@
}
this.setYawPitch(this.yaw, this.pitch);
@@ -122,7 +122,7 @@
if (this.v() == EntityMinecartAbstract.EnumMinecartType.RIDEABLE && this.motX * this.motX + this.motZ * this.motZ > 0.01D) {
List list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D), IEntitySelector.a(this));
@@ -278,8 +342,24 @@
@@ -274,8 +338,24 @@
Entity entity = (Entity) list.get(l);
if (!(entity instanceof EntityHuman) && !(entity instanceof EntityIronGolem) && !(entity instanceof EntityMinecartAbstract) && !this.isVehicle() && !entity.isPassenger()) {
@@ -147,7 +147,7 @@
entity.collide(this);
}
}
@@ -291,6 +371,14 @@
@@ -287,6 +367,14 @@
Entity entity1 = (Entity) iterator.next();
if (!this.w(entity1) && entity1.isCollidable() && entity1 instanceof EntityMinecartAbstract) {
@@ -162,7 +162,7 @@
entity1.collide(this);
}
}
@@ -301,7 +389,7 @@
@@ -297,7 +385,7 @@
}
protected double o() {
@@ -171,7 +171,7 @@
}
public void a(int i, int j, int k, boolean flag) {}
@@ -312,16 +400,20 @@
@@ -308,16 +396,20 @@
this.motX = MathHelper.a(this.motX, -d0, d0);
this.motZ = MathHelper.a(this.motZ, -d0, d0);
if (this.onGround) {
@@ -185,7 +185,7 @@
+ // CraftBukkit end
}
this.move(this.motX, this.motY, this.motZ);
this.move(EnumMoveType.SELF, this.motX, this.motY, this.motZ);
if (!this.onGround) {
- this.motX *= 0.949999988079071D;
- this.motY *= 0.949999988079071D;
@@ -198,7 +198,7 @@
}
}
@@ -509,7 +601,7 @@
@@ -505,7 +597,7 @@
}
protected void r() {
@@ -207,7 +207,7 @@
this.motX *= 0.996999979019165D;
this.motY *= 0.0D;
this.motZ *= 0.996999979019165D;
@@ -854,4 +946,26 @@
@@ -780,4 +872,26 @@
}
}