From d8a9c7be4227b2243968b63ab7cc7a00098c93ad Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Feb 2015 22:41:06 +0000 Subject: Update to Minecraft 1.8.3 --- nms-patches/EntityRabbit.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'nms-patches/EntityRabbit.patch') diff --git a/nms-patches/EntityRabbit.patch b/nms-patches/EntityRabbit.patch index 27893375..f794164e 100644 --- a/nms-patches/EntityRabbit.patch +++ b/nms-patches/EntityRabbit.patch @@ -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(); \ No newline at end of file + protected float bE() { + return this.moveController.a() && this.moveController.e() > this.locY + 0.5D ? 0.5F : this.bt.b(); -- cgit v1.2.3