Update to Minecraft 1.10
By: md_5 <git@md-5.net>
This commit is contained in:
parent
604d9373c0
commit
a39b7e5f3a
161 changed files with 1176 additions and 1147 deletions
|
@ -8,19 +8,21 @@
|
|||
public class EntityWitherSkull extends EntityFireball {
|
||||
|
||||
private static final DataWatcherObject<Boolean> e = DataWatcher.a(EntityWitherSkull.class, DataWatcherRegistry.h);
|
||||
@@ -37,9 +39,9 @@
|
||||
@@ -41,11 +43,11 @@
|
||||
if (!this.world.isClientSide) {
|
||||
if (movingobjectposition.entity != null) {
|
||||
if (this.shooter != null) {
|
||||
- if (movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F)) {
|
||||
+ if (movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F)) { // CraftBukkit
|
||||
if (!movingobjectposition.entity.isAlive()) {
|
||||
if (movingobjectposition.entity.isAlive()) {
|
||||
this.a(this.shooter, movingobjectposition.entity);
|
||||
} else {
|
||||
- this.shooter.heal(5.0F);
|
||||
+ this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
|
||||
} else {
|
||||
this.a(this.shooter, movingobjectposition.entity);
|
||||
}
|
||||
@@ -63,7 +65,15 @@
|
||||
}
|
||||
} else {
|
||||
@@ -67,7 +69,15 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue