From 7f5ff95fe4878367cfe7907cb39a43b15804f37b Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sat, 1 Jul 2023 20:56:18 +1000
Subject: [PATCH] Revert bad change to PathfinderGoalSit causing all cats to
 sit

By: md_5 <git@md-5.net>
---
 .../world/entity/ai/goal/PathfinderGoalSit.patch       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.patch
index 556796b404..10fef72e32 100644
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.patch
@@ -1,11 +1,11 @@
 --- a/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.java
 +++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.java
-@@ -21,7 +21,7 @@
- 
+@@ -22,7 +22,7 @@
      @Override
      public boolean canUse() {
--        if (!this.mob.isTame()) {
-+        if (false && !this.mob.isTame()) { // CraftBukkit - Allow sitting for wild animals
-             return false;
+         if (!this.mob.isTame()) {
+-            return false;
++            return this.mob.isOrderedToSit() && this.mob.getTarget() == null; // CraftBukkit - Allow sitting for wild animals
          } else if (this.mob.isInWaterOrBubble()) {
              return false;
+         } else if (!this.mob.onGround()) {