Minecraft 1.9.4

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-05-10 21:47:39 +10:00
parent c9a6e9175c
commit d506c12c07
236 changed files with 1471 additions and 1822 deletions

View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/server/EntitySheep.java
+++ b/net/minecraft/server/EntitySheep.java
@@ -4,6 +4,12 @@
import java.util.Map;
@@ -5,6 +5,12 @@
import java.util.Random;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.event.entity.SheepRegrowWoolEvent;
@@ -12,8 +12,8 @@
+
public class EntitySheep extends EntityAnimal {
private static final DataWatcherObject<Byte> bv = DataWatcher.a(EntitySheep.class, DataWatcherRegistry.a);
@@ -11,6 +17,13 @@
private static final DataWatcherObject<Byte> bw = DataWatcher.a(EntitySheep.class, DataWatcherRegistry.a);
@@ -12,6 +18,13 @@
public boolean a(EntityHuman entityhuman) {
return false;
}
@@ -25,9 +25,9 @@
+ }
+ // CraftBukkit end
}, 2, 1);
private static final Map<EnumColor, float[]> bx = Maps.newEnumMap(EnumColor.class);
private int bz;
@@ -25,6 +38,7 @@
private static final Map<EnumColor, float[]> by = Maps.newEnumMap(EnumColor.class);
private int bA;
@@ -26,6 +39,7 @@
this.setSize(0.9F, 1.3F);
this.container.setItem(0, new ItemStack(Items.DYE));
this.container.setItem(1, new ItemStack(Items.DYE));
@@ -35,8 +35,8 @@
}
protected void r() {
@@ -123,11 +137,22 @@
public boolean a(EntityHuman entityhuman, EnumHand enumhand, ItemStack itemstack) {
@@ -125,11 +139,22 @@
public boolean a(EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack) {
if (itemstack != null && itemstack.getItem() == Items.SHEARS && !this.isSheared() && !this.isBaby()) {
if (!this.world.isClientSide) {
+ // CraftBukkit start
@@ -58,7 +58,7 @@
entityitem.motY += (double) (this.random.nextFloat() * 0.05F);
entityitem.motX += (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F);
@@ -210,6 +235,12 @@
@@ -212,6 +237,12 @@
}
public void B() {