Merge pull request #179 from Elite-Modding-Team/122-dont-attack-ridin…

…g-mob-by-owner-while-riding Bugfix: prevent an owner from attacking their pet while riding/being ridden
Elite-Modding-Team · Aug 22, 2024 · e3457f6 · e3457f6
2 parents a72758d + b025cda
commit e3457f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/drzhark/mocreatures/entity/MoCEntityMob.java b/src/main/java/drzhark/mocreatures/entity/MoCEntityMob.java
@@ -237,7 +237,8 @@ public boolean attackEntityFrom(DamageSource damagesource, float i) {
         if (!this.world.isRemote && getIsTamed()) {
             MoCMessageHandler.INSTANCE.sendToAllAround(new MoCMessageHealth(this.getEntityId(), this.getHealth()), new TargetPoint(this.world.provider.getDimensionType().getId(), this.posX, this.posY, this.posZ, 64));
         }
-        return super.attackEntityFrom(damagesource, i);
+        Entity entity = damagesource.getTrueSource();
+        return (this.isBeingRidden() && entity != null && this.isRidingOrBeingRiddenBy(entity)) ? false : super.attackEntityFrom(damagesource, i);
     }
 
     /**

diff --git a/src/main/java/drzhark/mocreatures/entity/tameable/MoCEntityTameableAnimal.java b/src/main/java/drzhark/mocreatures/entity/tameable/MoCEntityTameableAnimal.java
@@ -111,7 +111,7 @@ public boolean attackEntityFrom(DamageSource damagesource, float i) {
             return false;
         }
 
-        return super.attackEntityFrom(damagesource, i);
+        return (this.isBeingRidden() && entity != null && this.isRidingOrBeingRiddenBy(entity)) ? false : super.attackEntityFrom(damagesource, i);
     }
 
     private boolean checkOwnership(EntityPlayer player, EnumHand hand) {