summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-12-31 14:00:55 -0600
committerfeildmaster <admin@feildmaster.com>2013-01-01 22:28:44 -0600
commit8f0c1aed6bb7d3dd24baffaa7e01d2297f159995 (patch)
treea2828d26a6fb3da10ea720ec4293fe1afccb12c9 /src/main/java/net/minecraft/server
parent05512942db5b6f1527dade5f98f295f14503a1d1 (diff)
downloadcraftbukkit-8f0c1aed6bb7d3dd24baffaa7e01d2297f159995.tar
craftbukkit-8f0c1aed6bb7d3dd24baffaa7e01d2297f159995.tar.gz
craftbukkit-8f0c1aed6bb7d3dd24baffaa7e01d2297f159995.tar.lz
craftbukkit-8f0c1aed6bb7d3dd24baffaa7e01d2297f159995.tar.xz
craftbukkit-8f0c1aed6bb7d3dd24baffaa7e01d2297f159995.zip
Fix "setSitting" on tameable animals. Fixes BUKKIT-1534
This makes it so animals (tame or not) will sit properly and not move around. Wild animals that are sitting may override the sitting position if they are attacking.
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r--src/main/java/net/minecraft/server/PathfinderGoalSit.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSit.java b/src/main/java/net/minecraft/server/PathfinderGoalSit.java
index 6b34a97c..3b9b97a5 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSit.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSit.java
@@ -12,7 +12,7 @@ public class PathfinderGoalSit extends PathfinderGoal {
public boolean a() {
if (!this.a.isTamed()) {
- return false;
+ return this.b && this.a.aG() == null; // CraftBukkit - Allow sitting for wild animals
} else if (this.a.H()) {
return false;
} else if (!this.a.onGround) {