Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-24 00:51:40 +01:00
Code Issues Projects Releases Wiki Activity

Minor instanceof casting change

Browse Source
This commit is contained in:
tastybento 2023-02-05 10:38:09 -08:00
parent 2c1a018071
commit ad2541963e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java
View File

@ -52,7 +52,7 @@ public class PVPListener extends FlagListener {
*/
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onEntityDamage(EntityDamageByEntityEvent e) {
if (e.getEntity() instanceof Player && getPlugin().getIWM().inWorld(e.getEntity().getWorld())) {
if (e.getEntity() instanceof Player player && getPlugin().getIWM().inWorld(e.getEntity().getWorld())) {
// Allow self damage or NPC attack because Citizens handles its own PVP
if (e.getEntity().equals(e.getDamager()) || e.getEntity().hasMetadata("NPC")) {
return;
@ -62,7 +62,7 @@ public class PVPListener extends FlagListener {
return;
}
// Protect visitors
if (e.getCause().equals(DamageCause.ENTITY_ATTACK) && protectedVisitor((Player)e.getEntity())) {
if (e.getCause().equals(DamageCause.ENTITY_ATTACK) && protectedVisitor(player)) {
if (e.getDamager() instanceof Player p && p != null) {
User.getInstance(p).notify(Flags.INVINCIBLE_VISITORS.getHintReference());
} else if (e.getDamager() instanceof Projectile pr && pr.getShooter() instanceof Player sh && sh != null) {