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

Update CraftBukkit to Minecraft 1.5

Browse Source
This commit is contained in:
Travis Watkins
2013-03-13 17:33:27 -05:00
parent ba6e4c38cf
commit 83d29e461c
246 changed files with 8499 additions and 6759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/net/minecraft/server/EntityAgeable.java
View File

@@ -1,6 +1,9 @@
package net.minecraft.server;
public abstract class EntityAgeable extends EntityCreature {
private float d = -1.0F;
private float e;
public boolean ageLocked = false; // CraftBukkit
public EntityAgeable(World world) {
@@ -9,7 +12,7 @@ public abstract class EntityAgeable extends EntityCreature {
public abstract EntityAgeable createChild(EntityAgeable entityageable);
public boolean a(EntityHuman entityhuman) {
public boolean a_(EntityHuman entityhuman) {
ItemStack itemstack = entityhuman.inventory.getItemInHand();
if (itemstack != null && itemstack.id == Item.MONSTER_EGG.id && !this.world.isStatic) {
@@ -22,9 +25,13 @@ public abstract class EntityAgeable extends EntityCreature {
entityageable.setAge(-24000);
entityageable.setPositionRotation(this.locX, this.locY, this.locZ, 0.0F, 0.0F);
this.world.addEntity(entityageable, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG); // CraftBukkit
if (itemstack.hasName()) {
entityageable.setCustomName(itemstack.getName());
}
if (!entityhuman.abilities.canInstantlyBuild) {
--itemstack.count;
if (itemstack.count == 0) { // CraftBukkit - allow less than 0 stacks as "infinit"
if (itemstack.count == 0) { // CraftBukkit - allow less than 0 stacks as "infinite"
entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, (ItemStack) null);
}
}
@@ -32,7 +39,7 @@ public abstract class EntityAgeable extends EntityCreature {
}
}
return super.a(entityhuman);
return super.a_(entityhuman);
}
protected void a() {
@@ -46,6 +53,7 @@ public abstract class EntityAgeable extends EntityCreature {
public void setAge(int i) {
this.datawatcher.watch(12, Integer.valueOf(i));
this.a(this.isBaby());
}
public void b(NBTTagCompound nbttagcompound) {
@@ -62,19 +70,40 @@ public abstract class EntityAgeable extends EntityCreature {
public void c() {
super.c();
int i = this.getAge();
if (this.world.isStatic || this.ageLocked) { // CraftBukkit
this.a(this.isBaby());
} else {
int i = this.getAge();
if (ageLocked) return; // CraftBukkit
if (i < 0) {
++i;
this.setAge(i);
} else if (i > 0) {
--i;
this.setAge(i);
if (i < 0) {
++i;
this.setAge(i);
} else if (i > 0) {
--i;
this.setAge(i);
}
}
}
public boolean isBaby() {
return this.getAge() < 0;
}
public void a(boolean flag) {
this.j(flag ? 0.5F : 1.0F);
}
protected final void a(float f, float f1) {
boolean flag = this.d > 0.0F;
this.d = f;
this.e = f1;
if (!flag) {
this.j(1.0F);
}
}
private void j(float f) {
super.a(this.d * f, this.e * f);
}
}