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

6
src/main/java/net/minecraft/server/EntityWitherSkull.java
View File

@@ -36,8 +36,8 @@ public class EntityWitherSkull extends EntityFireball {
if (!this.world.isStatic) {
if (movingobjectposition.entity != null) {
if (this.shooter != null) {
if (movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8) && !movingobjectposition.entity.isAlive()) {
this.shooter.heal(5, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
if (movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F) && !movingobjectposition.entity.isAlive()) {
this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
}
} else {
movingobjectposition.entity.damageEntity(DamageSource.MAGIC, 5);
@@ -77,7 +77,7 @@ public class EntityWitherSkull extends EntityFireball {
return false;
}
public boolean damageEntity(DamageSource damagesource, int i) {
public boolean damageEntity(DamageSource damagesource, float f) {
return false;
}