twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-28 10:53:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update CraftBukkit to 1.6.4

Browse Source
This commit is contained in:
feildmaster
2013-09-19 13:25:08 -05:00
parent e20ef1f606
commit dcb9d6a5ef
92 changed files with 730 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/minecraft/server/EntityMinecartAbstract.java
View File

@@ -79,14 +79,14 @@ public abstract class EntityMinecartAbstract extends Entity {
}
public AxisAlignedBB g(Entity entity) {
return entity.L() ? entity.boundingBox : null;
return entity.M() ? entity.boundingBox : null;
}
public AxisAlignedBB D() {
public AxisAlignedBB E() {
return null;
}
public boolean L() {
public boolean M() {
return true;
}
@@ -103,7 +103,7 @@ public abstract class EntityMinecartAbstract extends Entity {
this.world.getServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleCreateEvent((Vehicle) this.getBukkitEntity())); // CraftBukkit
}
public double X() {
public double Y() {
return (double) this.length * 0.0D - 0.30000001192092896D;
}
@@ -128,7 +128,7 @@ public abstract class EntityMinecartAbstract extends Entity {
this.h(-this.k());
this.c(10);
this.J();
this.K();
this.setDamage(this.getDamage() + f * 10.0F);
boolean flag = damagesource.getEntity() instanceof EntityHuman && ((EntityHuman) damagesource.getEntity()).abilities.canInstantlyBuild;
@@ -172,7 +172,7 @@ public abstract class EntityMinecartAbstract extends Entity {
this.a(itemstack, 0.0F);
}
public boolean K() {
public boolean L() {
return !this.dead;
}
@@ -205,7 +205,7 @@ public abstract class EntityMinecartAbstract extends Entity {
}
if (this.locY < -64.0D) {
this.B();
this.C();
}
int i;
@@ -214,12 +214,12 @@ public abstract class EntityMinecartAbstract extends Entity {
this.world.methodProfiler.a("portal");
MinecraftServer minecraftserver = ((WorldServer) this.world).getMinecraftServer();
i = this.y();
i = this.z();
if (this.ap) {
if (true || minecraftserver.getAllowNether()) { // CraftBukkit - multi-world should still allow teleport even if default vanilla nether disabled
if (this.vehicle == null && this.aq++ >= i) {
this.aq = i;
this.portalCooldown = this.ab();
this.portalCooldown = this.ac();
byte b0;
if (this.world.worldProvider.dimension == -1) {
@@ -295,7 +295,7 @@ public abstract class EntityMinecartAbstract extends Entity {
this.b(d4);
}
this.C();
this.D();
this.pitch = 0.0F;
double d6 = this.lastX - this.locX;
double d7 = this.lastZ - this.locZ;
@@ -335,7 +335,7 @@ public abstract class EntityMinecartAbstract extends Entity {
for (int j1 = 0; j1 < list.size(); ++j1) {
Entity entity = (Entity) list.get(j1);
if (entity != this.passenger && entity.L() && entity instanceof EntityMinecartAbstract) {
if (entity != this.passenger && entity.M() && entity instanceof EntityMinecartAbstract) {
entity.collide(this);
}
}