diff --git a/src/main/java/drzhark/mocreatures/client/model/MoCModelBigCat.java b/src/main/java/drzhark/mocreatures/client/model/MoCModelBigCat.java index 11465c726..b360d7f8f 100644 --- a/src/main/java/drzhark/mocreatures/client/model/MoCModelBigCat.java +++ b/src/main/java/drzhark/mocreatures/client/model/MoCModelBigCat.java @@ -113,7 +113,7 @@ public class MoCModelBigCat extends ModelBase { private float prevMouthAngle; private boolean isChested; private boolean diving; - private boolean isSitting; + protected boolean isSitting; public MoCModelBigCat() { this.textureWidth = 128; diff --git a/src/main/java/drzhark/mocreatures/client/model/MoCModelManticorePet.java b/src/main/java/drzhark/mocreatures/client/model/MoCModelManticorePet.java index d3c061b1b..15cd5a88d 100644 --- a/src/main/java/drzhark/mocreatures/client/model/MoCModelManticorePet.java +++ b/src/main/java/drzhark/mocreatures/client/model/MoCModelManticorePet.java @@ -23,6 +23,7 @@ public void updateAnimationModifiers(Entity entity) { this.hasSaberTeeth = true; this.onAir = manticorePet.isOnAir(); this.hasStinger = true; + this.isSitting = manticorePet.getIsSitting(); this.isMovingVertically = manticorePet.motionY != 0 && !manticorePet.onGround; this.hasChest = false; this.isTamed = false; diff --git a/src/main/java/drzhark/mocreatures/entity/MoCEntityAnimal.java b/src/main/java/drzhark/mocreatures/entity/MoCEntityAnimal.java index 8395876fb..8cf7e5c59 100644 --- a/src/main/java/drzhark/mocreatures/entity/MoCEntityAnimal.java +++ b/src/main/java/drzhark/mocreatures/entity/MoCEntityAnimal.java @@ -886,7 +886,7 @@ public boolean getIsSitting() { @Override public boolean isMovementCeased() { - return getIsSitting() || this.isBeingRidden(); + return this.getIsSitting() || this.isBeingRidden(); } public boolean getIsHunting() { diff --git a/src/main/java/drzhark/mocreatures/entity/hunter/MoCEntityManticorePet.java b/src/main/java/drzhark/mocreatures/entity/hunter/MoCEntityManticorePet.java index 88e3f2e02..ebe5ced4a 100644 --- a/src/main/java/drzhark/mocreatures/entity/hunter/MoCEntityManticorePet.java +++ b/src/main/java/drzhark/mocreatures/entity/hunter/MoCEntityManticorePet.java @@ -4,12 +4,14 @@ package drzhark.mocreatures.entity.hunter; import drzhark.mocreatures.MoCreatures; +import drzhark.mocreatures.init.MoCItems; import drzhark.mocreatures.init.MoCLootTables; import net.minecraft.entity.Entity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import javax.annotation.Nullable; @@ -72,6 +74,12 @@ public boolean processInteract(EntityPlayer player, EnumHand hand) { return tameResult; } + final ItemStack stack = player.getHeldItem(hand); + if (!stack.isEmpty() && getIsTamed() && (stack.getItem() == MoCItems.whip)) { + setSitting(!getIsSitting()); + return true; + } + if (this.getIsRideable() && this.getIsAdult() && (!this.getIsChested() || !player.isSneaking()) && !this.isBeingRidden()) { if (!this.world.isRemote && player.startRiding(this)) { player.rotationYaw = this.rotationYaw;