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

Update CraftBukkit to Minecraft 1.4.4.

Browse Source
This commit is contained in:
Travis Watkins
2012-11-06 06:05:28 -06:00
parent a0c3b4f9d1
commit 7f7192f8fd
169 changed files with 3295 additions and 2774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/net/minecraft/server/EntityEnderCrystal.java
View File

@@ -46,22 +46,26 @@ public class EntityEnderCrystal extends Entity {
}
public boolean damageEntity(DamageSource damagesource, int i) {
if (!this.dead && !this.world.isStatic) {
// CraftBukkit start - All non-living entities need this
if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, i)) {
return false;
}
// CraftBukkit end
if (this.isInvulnerable()) {
return false;
} else {
if (!this.dead && !this.world.isStatic) {
// CraftBukkit start - All non-living entities need this
if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, i)) {
return false;
}
// CraftBukkit end
this.b = 0;
if (this.b <= 0) {
this.die();
if (!this.world.isStatic) {
this.world.explode(this, this.locX, this.locY, this.locZ, 6.0F, true); // CraftBukkit - (Entity) null -> this
this.b = 0;
if (this.b <= 0) {
this.die();
if (!this.world.isStatic) {
this.world.explode(this, this.locX, this.locY, this.locZ, 6.0F, true); // CraftBukkit - (Entity) null -> this
}
}
}
}
return true;
return true;
}
}
}