SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check if at least one of the people fighting is human

Browse Source
This commit is contained in:
libraryaddict 2020-02-04 16:10:08 +13:00
parent 7f2de5194f
commit dd3017b0f9
No known key found for this signature in database
GPG Key ID: 052E4FBCD257AEA4
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/me/libraryaddict/disguise/DisguiseListener.java
View File

@ -25,10 +25,7 @@ import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.*;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -202,18 +199,22 @@ public class DisguiseListener implements Listener {
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onAttack(EntityDamageByEntityEvent event) { public void onAttack(EntityDamageByEntityEvent event) {
if (event.getEntity() instanceof Player) {
if (DisguiseConfig.isDisguiseBlownWhenAttacked()) {
checkPlayerCanBlowDisguise((Player) event.getEntity());
}
}
Entity attacker = event.getDamager(); Entity attacker = event.getDamager();
if (attacker instanceof Projectile && ((Projectile) attacker).getShooter() instanceof Player) { if (attacker instanceof Projectile && ((Projectile) attacker).getShooter() instanceof Player) {
attacker = (Entity) ((Projectile) attacker).getShooter(); attacker = (Entity) ((Projectile) attacker).getShooter();
} }
if (event.getEntityType() != EntityType.PLAYER && !(attacker instanceof Player)) {
return;
}
if (event.getEntity() instanceof Player) {
if (DisguiseConfig.isDisguiseBlownWhenAttacked()) {
checkPlayerCanBlowDisguise((Player) event.getEntity());
}
}
checkPlayerCanFight(event, attacker); checkPlayerCanFight(event, attacker);
if (attacker instanceof Player) { if (attacker instanceof Player) {