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

Update CraftBukkit to Minecraft 1.4.6

Browse Source
This commit is contained in:
feildmaster
2012-12-19 22:03:52 -06:00
parent 9f1bf124ee
commit 23b6764374
115 changed files with 1930 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ public class EntityFallingBlock extends Entity {
this.dropItem = true;
this.e = false;
this.hurtEntities = false;
this.fallHurtMax = 20;
this.fallHurtMax = 40;
this.fallHurtAmount = 2.0F;
}
@@ -39,7 +39,7 @@ public class EntityFallingBlock extends Entity {
this.dropItem = true;
this.e = false;
this.hurtEntities = false;
this.fallHurtMax = 20;
this.fallHurtMax = 40;
this.fallHurtAmount = 2.0F;
this.id = i;
this.data = j;
@@ -84,12 +84,13 @@ public class EntityFallingBlock extends Entity {
int k = MathHelper.floor(this.locZ);
if (this.c == 1) {
if (this.c == 1 && this.world.getTypeId(i, j, k) == this.id && this.world.getData(i, j, k) == this.data && !CraftEventFactory.callEntityChangeBlockEvent(this, i, j, k, 0, 0).isCancelled()) { // CraftBukkit - compare data and call event
this.world.setTypeId(i, j, k, 0);
} else {
// CraftBukkit - compare data and call event
if (this.c != 1 || this.world.getTypeId(i, j, k) != this.id || this.world.getData(i, j, k) != this.data || CraftEventFactory.callEntityChangeBlockEvent(this, i, j, k, 0, 0).isCancelled()) {
this.die();
return; // CraftBukkit
return;
}
this.world.setTypeId(i, j, k, 0);
}
if (this.onGround) {
@@ -196,4 +197,10 @@ public class EntityFallingBlock extends Entity {
public void e(boolean flag) {
this.hurtEntities = flag;
}
public void a(CrashReportSystemDetails crashreportsystemdetails) {
super.a(crashreportsystemdetails);
crashreportsystemdetails.a("Immitating block ID", Integer.valueOf(this.id));
crashreportsystemdetails.a("Immitating block data", Integer.valueOf(this.data));
}
}