Update CraftBukkit to Minecraft 1.3.1
This commit is contained in:
committed by
Travis Watkins
parent
08e2923bd4
commit
a43d621c01
@@ -1,7 +1,5 @@
|
||||
package net.minecraft.server;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
// CraftBukkit start
|
||||
import org.bukkit.event.block.EntityBlockFormEvent;
|
||||
import org.bukkit.event.entity.EntityDamageEvent;
|
||||
@@ -12,8 +10,8 @@ public class EntitySnowman extends EntityGolem {
|
||||
public EntitySnowman(World world) {
|
||||
super(world);
|
||||
this.texture = "/mob/snowman.png";
|
||||
this.b(0.4F, 1.8F);
|
||||
this.al().a(true);
|
||||
this.a(0.4F, 1.8F);
|
||||
this.getNavigation().a(true);
|
||||
this.goalSelector.a(1, new PathfinderGoalArrowAttack(this, 0.25F, 2, 20));
|
||||
this.goalSelector.a(2, new PathfinderGoalRandomStroll(this, 0.2F));
|
||||
this.goalSelector.a(3, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
|
||||
@@ -21,7 +19,7 @@ public class EntitySnowman extends EntityGolem {
|
||||
this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget(this, EntityMonster.class, 16.0F, 0, true));
|
||||
}
|
||||
|
||||
public boolean c_() {
|
||||
public boolean aV() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -29,9 +27,9 @@ public class EntitySnowman extends EntityGolem {
|
||||
return 4;
|
||||
}
|
||||
|
||||
public void e() {
|
||||
super.e();
|
||||
if (this.aT()) {
|
||||
public void d() {
|
||||
super.d();
|
||||
if (this.G()) {
|
||||
// CraftBukkit start
|
||||
EntityDamageEvent event = new EntityDamageEvent(this.getBukkitEntity(), EntityDamageEvent.DamageCause.DROWNING, 1);
|
||||
this.world.getServer().getPluginManager().callEvent(event);
|
||||
@@ -46,7 +44,7 @@ public class EntitySnowman extends EntityGolem {
|
||||
int i = MathHelper.floor(this.locX);
|
||||
int j = MathHelper.floor(this.locZ);
|
||||
|
||||
if (this.world.getBiome(i, j).i() > 1.0F) {
|
||||
if (this.world.getBiome(i, j).j() > 1.0F) {
|
||||
// CraftBukkit start
|
||||
EntityDamageEvent event = new EntityDamageEvent(this.getBukkitEntity(), EntityDamageEvent.DamageCause.MELTING, 1);
|
||||
this.world.getServer().getPluginManager().callEvent(event);
|
||||
@@ -63,7 +61,7 @@ public class EntitySnowman extends EntityGolem {
|
||||
int k = MathHelper.floor(this.locY);
|
||||
int l = MathHelper.floor(this.locZ + (double) ((float) (i / 2 % 2 * 2 - 1) * 0.25F));
|
||||
|
||||
if (this.world.getTypeId(j, k, l) == 0 && this.world.getBiome(j, l).i() < 0.8F && Block.SNOW.canPlace(this.world, j, k, l)) {
|
||||
if (this.world.getTypeId(j, k, l) == 0 && this.world.getBiome(j, l).j() < 0.8F && Block.SNOW.canPlace(this.world, j, k, l)) {
|
||||
// CraftBukkit start
|
||||
org.bukkit.block.BlockState blockState = this.world.getWorld().getBlockAt(j, k, l).getState();
|
||||
blockState.setTypeId(Block.SNOW.id);
|
||||
@@ -79,21 +77,13 @@ public class EntitySnowman extends EntityGolem {
|
||||
}
|
||||
}
|
||||
|
||||
public void b(NBTTagCompound nbttagcompound) {
|
||||
super.b(nbttagcompound);
|
||||
}
|
||||
|
||||
public void a(NBTTagCompound nbttagcompound) {
|
||||
super.a(nbttagcompound);
|
||||
}
|
||||
|
||||
protected int getLootId() {
|
||||
return Item.SNOW_BALL.id;
|
||||
}
|
||||
|
||||
protected void dropDeathLoot(boolean flag, int i) {
|
||||
// CraftBukkit start
|
||||
List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>();
|
||||
java.util.List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>();
|
||||
int j = this.random.nextInt(16);
|
||||
|
||||
if (j > 0) {
|
||||
|
||||
Reference in New Issue
Block a user