Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to 1.6.2

Browse Source
This commit is contained in:
mbax
2013-07-08 19:43:37 -04:00
parent 2d9a9d8cea
commit f6a0b1e426
87 changed files with 1162 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
src/main/java/net/minecraft/server/EntityHuman.java
View File

@@ -77,9 +77,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
this.maxFireTicks = 20;
}
protected void ax() {
super.ax();
this.aT().b(GenericAttributes.e).a(1.0D);
protected void ay() {
super.ay();
this.aW().b(GenericAttributes.e).setValue(1.0D);
}
protected void a() {
@@ -89,19 +89,19 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
this.datawatcher.a(18, Integer.valueOf(0));
}
public boolean bm() {
public boolean bq() {
return this.f != null;
}
public void bo() {
public void bs() {
if (this.f != null) {
this.f.b(this.world, this, this.g);
}
this.bp();
this.bt();
}
public void bp() {
public void bt() {
this.f = null;
this.g = 0;
if (!this.world.isStatic) {
@@ -110,7 +110,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
public boolean isBlocking() {
return this.bm() && Item.byId[this.f.id].c_(this.f) == EnumAnimation.BLOCK;
return this.bq() && Item.byId[this.f.id].c_(this.f) == EnumAnimation.BLOCK;
}
public void l_() {
@@ -126,7 +126,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
this.n();
}
} else {
this.bp();
this.bt();
}
}
@@ -213,7 +213,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
return this.abilities.isInvulnerable ? 0 : 80;
}
public int aa() {
public int ab() {
return 10;
}
@@ -283,11 +283,11 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
}
this.bp();
this.bt();
}
}
protected boolean aY() {
protected boolean bb() {
return this.getHealth() <= 0.0F || this.isSleeping();
}
@@ -318,7 +318,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
}
public void T() {
public void U() {
if (!this.world.isStatic && this.isSneaking()) {
this.mount((Entity) null);
this.setSneaking(false);
@@ -329,7 +329,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
float f = this.yaw;
float f1 = this.pitch;
super.T();
super.U();
this.bs = this.bt;
this.bt = 0.0F;
this.k(this.locX - d0, this.locY - d1, this.locZ - d2);
@@ -341,9 +341,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
}
protected void bh() {
super.bh();
this.aS();
protected void bk() {
super.bk();
this.aV();
}
public void c() {
@@ -359,10 +359,10 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
this.inventory.k();
this.bs = this.bt;
super.c();
AttributeInstance attributeinstance = this.a(GenericAttributes.d);
AttributeInstance attributeinstance = this.getAttributeInstance(GenericAttributes.d);
if (!this.world.isStatic) {
attributeinstance.a((double) this.abilities.b());
attributeinstance.setValue((double) this.abilities.b());
}
this.aR = this.bL;
@@ -370,7 +370,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
this.aR = (float) ((double) this.aR + (double) this.bL * 0.3D);
}
this.i((float) attributeinstance.e());
this.i((float) attributeinstance.getValue());
float f = MathHelper.sqrt(this.motX * this.motX + this.motZ * this.motZ);
// CraftBukkit - Math -> TrigMath
float f1 = (float) org.bukkit.craftbukkit.TrigMath.atan(-this.motY * 0.20000000298023224D) * 15.0F;
@@ -700,10 +700,6 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
entity = ((EntityArrow) entity).shooter;
}
if (entity instanceof EntityLiving) {
this.a((EntityLiving) entity, false);
}
this.a(StatisticList.x, Math.round(f * 10.0F));
return super.damageEntity(damagesource, f);
}
@@ -737,43 +733,15 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
// CraftBukkit end
}
protected void a(EntityLiving entityliving, boolean flag) {
if (!(entityliving instanceof EntityCreeper) && !(entityliving instanceof EntityGhast)) {
if (entityliving instanceof EntityWolf) {
EntityWolf entitywolf = (EntityWolf) entityliving;
if (entitywolf.isTamed() && this.name.equals(entitywolf.getOwnerName())) {
return;
}
}
if (!(entityliving instanceof EntityHuman) || this.a((EntityHuman) entityliving)) {
if (!(entityliving instanceof EntityHorse) || !((EntityHorse) entityliving).bS()) {
List list = this.world.a(EntityWolf.class, AxisAlignedBB.a().a(this.locX, this.locY, this.locZ, this.locX + 1.0D, this.locY + 1.0D, this.locZ + 1.0D).grow(16.0D, 4.0D, 16.0D));
Iterator iterator = list.iterator();
while (iterator.hasNext()) {
EntityWolf entitywolf1 = (EntityWolf) iterator.next();
if (entitywolf1.isTamed() && entitywolf1.bJ() == null && this.name.equals(entitywolf1.getOwnerName()) && (!flag || !entitywolf1.isSitting())) {
entitywolf1.setSitting(false);
entitywolf1.setTarget(entityliving);
}
}
}
}
}
}
protected void h(float f) {
this.inventory.a(f);
}
public int aM() {
public int aP() {
return this.inventory.l();
}
public float bs() {
public float bw() {
int i = 0;
ItemStack[] aitemstack = this.inventory.armor;
int j = aitemstack.length;
@@ -799,14 +767,14 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
f = this.c(damagesource, f);
float f1 = f;
f = Math.max(f - this.bj(), 0.0F);
this.m(this.bj() - (f1 - f));
f = Math.max(f - this.bm(), 0.0F);
this.m(this.bm() - (f1 - f));
if (f != 0.0F) {
this.a(damagesource.f());
float f2 = this.getHealth();
this.setHealth(this.getHealth() - f);
this.aN().a(damagesource, f2, f);
this.aQ().a(damagesource, f2, f);
}
}
}
@@ -826,7 +794,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
public void c(ItemStack itemstack) {}
public boolean p(Entity entity) {
ItemStack itemstack = this.bt();
ItemStack itemstack = this.bx();
ItemStack itemstack1 = itemstack != null ? itemstack.cloneItemStack() : null;
if (!entity.c(this)) {
@@ -838,7 +806,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
if (itemstack.a(this, (EntityLiving) entity)) {
// CraftBukkit - bypass infinite items; <= 0 -> == 0
if (itemstack.count == 0 && !this.abilities.canInstantlyBuild) {
this.bu();
this.by();
}
return true;
@@ -847,9 +815,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
return false;
} else {
if (itemstack != null && itemstack == this.bt()) {
if (itemstack != null && itemstack == this.bx()) {
if (itemstack.count <= 0 && !this.abilities.canInstantlyBuild) {
this.bu();
this.by();
} else if (itemstack.count < itemstack1.count && this.abilities.canInstantlyBuild) {
itemstack.count = itemstack1.count;
}
@@ -859,22 +827,22 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
}
public ItemStack bt() {
public ItemStack bx() {
return this.inventory.getItemInHand();
}
public void bu() {
public void by() {
this.inventory.setItem(this.inventory.itemInHandIndex, (ItemStack) null);
}
public double V() {
public double W() {
return (double) (this.height - 0.5F);
}
public void attack(Entity entity) {
if (entity.ao()) {
if (entity.ap()) {
if (!entity.i(this)) {
float f = (float) this.a(GenericAttributes.e).e();
float f = (float) this.getAttributeInstance(GenericAttributes.e).getValue();
int i = 0;
float f1 = 0.0F;
@@ -940,7 +908,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
}
ItemStack itemstack = this.bt();
ItemStack itemstack = this.bx();
Object object = entity;
if (entity instanceof EntityComplexPart) {
@@ -955,15 +923,11 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
itemstack.a((EntityLiving) object, this);
// CraftBukkit - bypass infinite items; <= 0 -> == 0
if (itemstack.count == 0) {
this.bu();
this.by();
}
}
if (entity instanceof EntityLiving) {
if (entity.isAlive()) {
this.a((EntityLiving) entity, true);
}
this.a(StatisticList.w, Math.round(f * 10.0F));
if (j > 0 && flag2) {
// CraftBukkit start - Call a combust event when somebody hits with a fire enchanted item
@@ -1028,7 +992,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
}
if (this.ae()) {
if (this.af()) {
this.mount((Entity) null);
}
@@ -1228,8 +1192,8 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
public void a(Statistic statistic, int i) {}
protected void ba() {
super.ba();
protected void bd() {
super.bd();
this.a(StatisticList.u, 1);
if (this.isSprinting()) {
this.a(0.8F);
@@ -1258,8 +1222,8 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
this.checkMovement(this.locX - d0, this.locY - d1, this.locZ - d2);
}
public float bc() {
return (float) this.a(GenericAttributes.d).e();
public float bf() {
return (float) this.getAttributeInstance(GenericAttributes.d).getValue();
}
public void checkMovement(double d0, double d1, double d2) {
@@ -1338,9 +1302,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
}
public void ak() {
public void al() {
if (!this.abilities.isFlying) {
super.ak();
super.al();
}
}
@@ -1400,7 +1364,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
return (flag || this.foodData.c()) && !this.abilities.isInvulnerable;
}
public boolean bE() {
public boolean bI() {
return this.getHealth() > 0.0F && this.getHealth() < this.getMaxHealth();
}
@@ -1427,8 +1391,8 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
return true;
}
if (this.bt() != null) {
ItemStack itemstack = this.bt();
if (this.bx() != null) {
ItemStack itemstack = this.bx();
if (itemstack.b(block) || itemstack.a(block) > 1.0F) {
return true;
@@ -1507,7 +1471,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
return i == 0 ? this.inventory.getItemInHand() : this.inventory.armor[i - 1];
}
public ItemStack aV() {
public ItemStack aY() {
return this.inventory.getItemInHand();
}
@@ -1519,7 +1483,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
return this.inventory.armor;
}
public boolean av() {
public boolean aw() {
return !this.abilities.isFlying;
}
@@ -1527,7 +1491,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
return this.world.getScoreboard();
}
public ScoreboardTeam getScoreboardTeam() {
public ScoreboardTeamBase getScoreboardTeam() {
return this.getScoreboard().getPlayerTeam(this.name);
}
@@ -1544,7 +1508,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
this.getDataWatcher().watch(17, Float.valueOf(f));
}
public float bj() {
public float bm() {
return this.getDataWatcher().getFloat(17);
}
}