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

Update for 1.1_01 renames.

Browse Source 
We know these updates (can) break plugins bypassing Bukkit. They are needed for
smooth updates however. There will be another one right before before 1.1-R1.
This commit is contained in:
Erik Broes
2012-01-14 21:03:48 +01:00
parent 6495eee0c9
commit 61ec751ca1
85 changed files with 466 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minecraft/server/EntitySheep.java
View File

@@ -35,7 +35,7 @@ public class EntitySheep extends EntityAnimal {
// CraftBukkit end
}
protected int e() {
protected int getLootId() {
return Block.WOOL.id;
}
@@ -58,7 +58,7 @@ public class EntitySheep extends EntityAnimal {
int j;
int k;
if (!this.E() && this.b <= 0 && (this.l() && this.random.nextInt(50) == 0 || this.random.nextInt(1000) == 0)) {
if (!this.E() && this.b <= 0 && (this.isBaby() && this.random.nextInt(50) == 0 || this.random.nextInt(1000) == 0)) {
i = MathHelper.floor(this.locX);
j = MathHelper.floor(this.locY);
k = MathHelper.floor(this.locZ);
@@ -84,7 +84,7 @@ public class EntitySheep extends EntityAnimal {
if (flag) {
this.setSheared(false);
if (this.l()) {
if (this.isBaby()) {
int l = this.getAge() + 1200;
if (l > 0) {
@@ -104,7 +104,7 @@ public class EntitySheep extends EntityAnimal {
public boolean b(EntityHuman entityhuman) {
ItemStack itemstack = entityhuman.inventory.getItemInHand();
if (itemstack != null && itemstack.id == Item.SHEARS.id && !this.isSheared() && !this.l()) {
if (itemstack != null && itemstack.id == Item.SHEARS.id && !this.isSheared() && !this.isBaby()) {
if (!this.world.isStatic) {
this.setSheared(true);
int i = 1 + this.random.nextInt(3);