Fix pets sitting when mounted

patches/server/0010-Integrate-ridables.patch

@@ -1,4 +1,4 @@
-From a97e3e26b3074ad6206e438b51da7cd1e3cc4d75 Mon Sep 17 00:00:00 2001
+From 855ab1241e8756277c826720d9d4ecb282bb0c7d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 30 Apr 2019 19:17:21 -0500
 Subject: [PATCH] Integrate ridables
@@ -9,7 +9,7 @@ Subject: [PATCH] Integrate ridables
  .../net/minecraft/server/EntityAgeable.java   |   2 +-
  .../java/net/minecraft/server/EntityBat.java  |  21 +++
  .../net/minecraft/server/EntityBlaze.java     |  15 ++-
- .../java/net/minecraft/server/EntityCat.java  |  22 +++-
+ .../java/net/minecraft/server/EntityCat.java  |  23 +++-
  .../minecraft/server/EntityCaveSpider.java    |   1 +
  .../net/minecraft/server/EntityChicken.java   |   4 +-
  .../java/net/minecraft/server/EntityCod.java  |   1 +
@@ -22,7 +22,7 @@ Subject: [PATCH] Integrate ridables
  .../net/minecraft/server/EntityEndermite.java |   4 +-
  .../net/minecraft/server/EntityEvoker.java    |   4 +-
  .../java/net/minecraft/server/EntityFish.java |  25 ++--
- .../java/net/minecraft/server/EntityFox.java  |  46 +++++--
+ .../java/net/minecraft/server/EntityFox.java  |  47 +++++--
  .../net/minecraft/server/EntityGhast.java     |   6 +-
  .../minecraft/server/EntityGiantZombie.java   |   2 +
  .../net/minecraft/server/EntityGuardian.java  |  28 +++-
@@ -70,7 +70,7 @@ Subject: [PATCH] Integrate ridables
  .../minecraft/server/EntityVindicator.java    |   2 +
  .../net/minecraft/server/EntityWitch.java     |   4 +-
  .../net/minecraft/server/EntityWither.java    |   4 +-
- .../java/net/minecraft/server/EntityWolf.java |   2 +
+ .../java/net/minecraft/server/EntityWolf.java |  10 ++
  .../net/minecraft/server/EntityZombie.java    |   2 +
  .../minecraft/server/EntityZombieHusk.java    |   1 +
  .../server/EntityZombieVillager.java          |   3 +-
@@ -83,7 +83,7 @@ Subject: [PATCH] Integrate ridables
  .../pathfinder/PathfinderGoalHasRider.java    |  17 +++
  .../craftbukkit/entity/CraftLivingEntity.java |  10 ++
  .../bukkit/craftbukkit/entity/CraftMob.java   |  12 ++
- 79 files changed, 1243 insertions(+), 114 deletions(-)
+ 79 files changed, 1253 insertions(+), 114 deletions(-)
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
  create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -295,7 +295,7 @@ index 89f1bfa41..8b8423c6b 100644
          if (this.c <= 0) {
              this.c = 100;
 diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
-index f4660233e..772c6ce79 100644
+index f4660233e..d526fc6f5 100644
 --- a/src/main/java/net/minecraft/server/EntityCat.java
 +++ b/src/main/java/net/minecraft/server/EntityCat.java
 @@ -16,7 +16,7 @@ public class EntityCat extends EntityTameableAnimal {
@@ -360,12 +360,13 @@ index f4660233e..772c6ce79 100644
                      this.goalSit.setSitting(!this.isSitting());
                  }
              }
-@@ -381,6 +384,15 @@ public class EntityCat extends EntityTameableAnimal {
+@@ -381,6 +384,16 @@ public class EntityCat extends EntityTameableAnimal {
  
      }
  
 +    // Purpur start
 +    public void onMount(EntityHuman entityhuman) {
++        setGoalTarget(null);
 +        setSitting(false);
 +        u(false); // setSleepingWithOwner
 +        v(false); // setHeadDown
@@ -761,7 +762,7 @@ index 90479feb4..884d14e1c 100644
                  this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 1da2f013f..27b29f633 100644
+index 1da2f013f..9bf665f51 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -48,6 +48,7 @@ public class EntityFox extends EntityAnimal {
@@ -837,7 +838,7 @@ index 1da2f013f..27b29f633 100644
      }
  
      @Override
-@@ -618,7 +625,30 @@ public class EntityFox extends EntityAnimal {
+@@ -618,7 +625,31 @@ public class EntityFox extends EntityAnimal {
          return deathEvent; // Paper
      }
  
@@ -849,6 +850,7 @@ index 1da2f013f..27b29f633 100644
 +
 +    @Override
 +    public void onMount(EntityHuman entityhuman) {
++        setGoalTarget(null);
 +        setCanPickupLoot(false);
 +        stopActions();
 +        setChasing(false);
@@ -868,7 +870,7 @@ index 1da2f013f..27b29f633 100644
          double d0 = entityliving.locZ - entityfox.locZ;
          double d1 = entityliving.locX - entityfox.locX;
          double d2 = d0 / d1;
-@@ -681,16 +711,16 @@ public class EntityFox extends EntityAnimal {
+@@ -681,16 +712,16 @@ public class EntityFox extends EntityAnimal {
          }
      }
  
@@ -888,7 +890,7 @@ index 1da2f013f..27b29f633 100644
              }
  
          }
-@@ -1349,16 +1379,16 @@ public class EntityFox extends EntityAnimal {
+@@ -1349,16 +1380,16 @@ public class EntityFox extends EntityAnimal {
          }
      }
  
@@ -2570,7 +2572,7 @@ index 8b3052b11..575f04651 100644
          this.goalSelector.a(5, new PathfinderGoalRandomStrollLand(this, 1.0D));
          this.goalSelector.a(6, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 02492663a..b153853ab 100644
+index 02492663a..bec92f199 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -28,6 +28,7 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -2589,6 +2591,21 @@ index 02492663a..b153853ab 100644
          this.goalSelector.a(2, this.goalSit);
          this.goalSelector.a(3, new EntityWolf.a<>(this, EntityLlama.class, 24.0F, 1.5D, 1.5D));
          this.goalSelector.a(4, new PathfinderGoalLeapAtTarget(this, 0.4F));
+@@ -434,6 +436,14 @@ public class EntityWolf extends EntityTameableAnimal {
+         return !this.isAngry() && super.a(entityhuman);
+     }
+ 
++    // Purpur start
++    public void onMount(EntityHuman entityhuman) {
++        setGoalTarget(null);
++        setSitting(false);
++        super.onMount(entityhuman);
++    }
++    // Purpur end
++
+     class a<T extends EntityLiving> extends PathfinderGoalAvoidTarget<T> {
+ 
+         private final EntityWolf j;
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
 index 99b2e7815..96676a786 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java