Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,25 +1,25 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityRabbit.java Sat Dec 6 21:44:10 2014
+++ src/main/java/net/minecraft/server/EntityRabbit.java Sat Dec 6 21:33:23 2014
--- /home/matt/mc-dev-private//net/minecraft/server/EntityRabbit.java 2015-02-26 22:40:22.671608138 +0000
+++ src/main/java/net/minecraft/server/EntityRabbit.java 2015-02-26 22:40:22.675608138 +0000
@@ -21,6 +21,12 @@
this.g = new ControllerJumpRabbit(this, this);
this.moveController = new ControllerMoveRabbit(this);
this.g = new EntityRabbit.ControllerJumpRabbit(this);
this.moveController = new EntityRabbit.ControllerMoveRabbit(this);
((Navigation) this.getNavigation()).a(true);
+ this.initializePathFinderGoals(); // CraftBukkit - moved code
+ this.b(0.0D);
+ }
+
+
+ // CraftBukkit start - code from constructor
+ public void initializePathFinderGoals(){
this.navigation.a(2.5F);
this.goalSelector.a(1, new PathfinderGoalFloat(this));
this.goalSelector.a(1, new PathfinderGoalRabbitPanic(this, 1.33D));
@@ -31,8 +37,8 @@
this.goalSelector.a(1, new EntityRabbit.PathfinderGoalRabbitPanic(this, 1.33D));
@@ -33,8 +39,8 @@
this.goalSelector.a(11, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 10.0F));
this.bk = new PathfinderGoalRabbitAvoidTarget(this, new EntitySelectorRabbitWolf(this), 16.0F, 1.33D, 1.33D);
this.goalSelector.a(4, this.bk);
this.bm = new EntityRabbit.PathfinderGoalRabbitAvoidTarget(this, EntityWolf.class, 16.0F, 1.33D, 1.33D);
this.goalSelector.a(4, this.bm);
- this.b(0.0D);
}
+ // CraftBukkit end
protected float bD() {
return this.moveController.a() && this.moveController.e() > this.locY + 0.5D ? 0.5F : this.br.b();
protected float bE() {
return this.moveController.a() && this.moveController.e() > this.locY + 0.5D ? 0.5F : this.bt.b();