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

Update CraftBukkit to 1.6.1

Browse Source
This commit is contained in:
Nate Mortensen
2013-07-01 06:03:00 -05:00
committed by Wesley Wolfe
parent f887b76a25
commit 6c09066e22
228 changed files with 6426 additions and 5442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/minecraft/server/EntityFallingBlock.java
View File

@@ -22,13 +22,9 @@ public class EntityFallingBlock extends Entity {
public EntityFallingBlock(World world) {
super(world);
this.c = 0;
this.dropItem = true;
this.f = false;
this.hurtEntities = false;
this.fallHurtMax = 40;
this.fallHurtAmount = 2.0F;
this.tileEntityData = null;
}
public EntityFallingBlock(World world, double d0, double d1, double d2, int i) {
@@ -37,13 +33,9 @@ public class EntityFallingBlock extends Entity {
public EntityFallingBlock(World world, double d0, double d1, double d2, int i, int j) {
super(world);
this.c = 0;
this.dropItem = true;
this.f = false;
this.hurtEntities = false;
this.fallHurtMax = 40;
this.fallHurtAmount = 2.0F;
this.tileEntityData = null;
this.id = i;
this.data = j;
this.m = true;
@@ -58,7 +50,7 @@ public class EntityFallingBlock extends Entity {
this.lastZ = d2;
}
protected boolean f_() {
protected boolean e_() {
return false;
}
@@ -150,7 +142,7 @@ public class EntityFallingBlock extends Entity {
}
}
protected void a(float f) {
protected void b(float f) {
if (this.hurtEntities) {
int i = MathHelper.f(f - 1.0F);
@@ -163,14 +155,14 @@ public class EntityFallingBlock extends Entity {
Entity entity = (Entity) iterator.next();
// CraftBukkit start
int damage = Math.min(MathHelper.d((float) i * this.fallHurtAmount), this.fallHurtMax);
float damage = (float) Math.min(MathHelper.d((float) i * this.fallHurtAmount), this.fallHurtMax);
EntityDamageEvent event = CraftEventFactory.callEntityDamageEvent(this, entity, EntityDamageEvent.DamageCause.FALLING_BLOCK, damage);
if (event.isCancelled()) {
continue;
}
entity.damageEntity(damagesource, event.getDamage());
entity.damageEntity(damagesource, (float) event.getDamage());
// CraftBukkit end
}