Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent axolotls from targeting protected mobs #6140

Merged
merged 1 commit into from
Aug 30, 2022
Merged

Prevent axolotls from targeting protected mobs #6140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/com/palmergames/bukkit/towny/listeners/TownyEntityListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Mob;
import org.bukkit.entity.Monster;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.entity.ThrownPotion;
import org.bukkit.entity.Vehicle;
import org.bukkit.entity.Villager;
import org.bukkit.entity.memory.MemoryKey;
import org.bukkit.event.Cancellable;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
Expand All @@ -46,6 +48,7 @@
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntityInteractEvent;
import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
import org.bukkit.event.entity.LingeringPotionSplashEvent;
import org.bukkit.event.entity.PigZapEvent;
import org.bukkit.event.entity.PotionSplashEvent;
Expand Down Expand Up @@ -144,6 +147,22 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
}
}

/**
* Prevent axolotl from targeting protected mobs.
*
* @param event - EntityTargetLivingEntityEvent
*/
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onAxolotlTarget(EntityTargetLivingEntityEvent event) {
if (event.getEntity() instanceof Mob attacker &&
attacker.getType().name().equals("AXOLOTL") &&
event.getTarget() instanceof Mob defender &&
CombatUtil.preventDamageCall(attacker, defender, DamageCause.ENTITY_ATTACK)) {
attacker.setMemory(MemoryKey.HAS_HUNTING_COOLDOWN, true);
event.setCancelled(true);
}
}

/**
* Prevent monsters from dropping blocks if within an arena plot.
*
Expand Down
3 changes: 0 additions & 3 deletions src/com/palmergames/bukkit/towny/utils/CombatUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Axolotl;
import org.bukkit.entity.Entity;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.LightningStrike;
Expand Down Expand Up @@ -294,8 +293,6 @@ && preventPvP(world, defenderTB)) {
}

if (attackingEntity.getType().name().equals("AXOLOTL") && EntityTypeUtil.isInstanceOfAny(TownySettings.getProtectedEntityTypes(), defendingEntity)) {
//TODO: Targeting not actually removed
((Axolotl) attackingEntity).setTarget(null);
return true;
}
}
Expand Down