Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Code refactoring around User.getInstance(player)

This commit is contained in:
tastybento 2021-10-30 14:02:30 -07:00
parent 1953caa7c5
commit 5e3cffbe11
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/bentobox/api/user/User.java
View File

@ -65,8 +65,8 @@ public class User implements MetaDataAble {
*/
@NonNull
public static User getInstance(@NonNull CommandSender sender) {
if (sender instanceof Player) {
return getInstance((Player)sender);
if (sender instanceof Player p) {
return getInstance(p);
}
// Console
return new User(sender);

5
src/main/java/world/bentobox/bentobox/listeners/flags/protection/LockAndBanListener.java
View File

@ -11,6 +11,7 @@ import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.event.vehicle.VehicleMoveEvent;
import org.bukkit.util.Vector;
import org.eclipse.jdt.annotation.NonNull;
import io.papermc.lib.PaperLib;
import world.bentobox.bentobox.BentoBox;
@ -103,7 +104,7 @@ public class LockAndBanListener extends FlagListener {
* @param loc - location to check
* @return CheckResult LOCKED, BANNED or OPEN. If an island is locked, that will take priority over banned
*/
private CheckResult check(Player player, Location loc) {
private CheckResult check(@NonNull Player player, Location loc) {
// Ops or NPC's are allowed everywhere
if (player.isOp() || player.hasMetadata("NPC")) {
return CheckResult.OPEN;
@ -127,7 +128,7 @@ public class LockAndBanListener extends FlagListener {
* @param loc - location to check
* @return true if banned
*/
private CheckResult checkAndNotify(Player player, Location loc) {
private CheckResult checkAndNotify(@NonNull Player player, Location loc) {
CheckResult r = check(player,loc);
switch (r) {
case BANNED:

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

@ -2,7 +2,6 @@ package world.bentobox.bentobox.listeners.flags.settings;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import java.util.WeakHashMap;
@ -25,6 +24,7 @@ import org.bukkit.event.entity.LingeringPotionSplashEvent;
import org.bukkit.event.entity.PotionSplashEvent;
import org.bukkit.event.player.PlayerFishEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.eclipse.jdt.annotation.NonNull;
import world.bentobox.bentobox.api.events.flags.FlagSettingChangeEvent;
import world.bentobox.bentobox.api.flags.Flag;
@ -62,10 +62,10 @@ public class PVPListener extends FlagListener {
}
// Protect visitors
if (e.getCause().equals(DamageCause.ENTITY_ATTACK) && protectedVisitor((Player)e.getEntity())) {
if (e.getDamager() instanceof Player) {
User.getInstance(e.getDamager()).notify(Flags.INVINCIBLE_VISITORS.getHintReference());
} else if (e.getDamager() instanceof Projectile && ((Projectile)e.getDamager()).getShooter() instanceof Player) {
User.getInstance((Player)((Projectile)e.getDamager()).getShooter()).notify(Flags.INVINCIBLE_VISITORS.getHintReference());
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) {
User.getInstance(sh).notify(Flags.INVINCIBLE_VISITORS.getHintReference());
}
e.setCancelled(true);
} else {
@ -89,9 +89,8 @@ public class PVPListener extends FlagListener {
user.notify(getFlag(damager.getWorld()).getHintReference());
e.setCancelled(true);
}
} else if (damager instanceof Projectile p && ((Projectile)damager).getShooter() instanceof Player) {
} else if (damager instanceof Projectile p && ((Projectile)damager).getShooter() instanceof Player shooter) {
// Find out who fired the arrow
Player shooter =(Player)p.getShooter();
processDamage(e, damager, shooter, hurtEntity, flag);
} else if (damager instanceof Firework && firedFireworks.containsKey(damager)) {
Player shooter = firedFireworks.get(damager);
@ -101,7 +100,7 @@ public class PVPListener extends FlagListener {
private void processDamage(Cancellable e, Entity damager, Player shooter, Entity hurtEntity, Flag flag) {
// Allow self damage
if (hurtEntity.equals(shooter)) {
if (hurtEntity.equals(shooter) || shooter == null) {
return;
}
User user = User.getInstance(shooter);
@ -116,22 +115,22 @@ public class PVPListener extends FlagListener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onFishing(PlayerFishEvent e) {
if (e.getCaught() instanceof Player && getPlugin().getIWM().inWorld(e.getCaught().getLocation())) {
if (e.getCaught() instanceof Player c && getPlugin().getIWM().inWorld(c.getLocation())) {
// Allow self-inflicted damage or NPC damage
if (e.getCaught().equals(e.getPlayer()) || e.getCaught().hasMetadata("NPC")) {
if (c.equals(e.getPlayer()) || c.hasMetadata("NPC")) {
return;
}
// Is PVP allowed here?
if (this.PVPAllowed(e.getCaught().getLocation())) {
if (this.PVPAllowed(c.getLocation())) {
return;
}
// Protect visitors
if (protectedVisitor((Player)e.getCaught())) {
if (protectedVisitor(c)) {
User.getInstance(e.getPlayer()).notify(Flags.INVINCIBLE_VISITORS.getHintReference());
e.setCancelled(true);
} else if (!checkIsland(e, e.getPlayer(), e.getCaught().getLocation(), getFlag(e.getCaught().getWorld()))) {
} else if (!checkIsland(e, e.getPlayer(), c.getLocation(), getFlag(c.getWorld()))) {
e.getHook().remove();
User.getInstance(e.getPlayer()).notify(getFlag(e.getCaught().getWorld()).getHintReference());
User.getInstance(e.getPlayer()).notify(getFlag(c.getWorld()).getHintReference());
e.setCancelled(true);
}
}
@ -143,8 +142,8 @@ public class PVPListener extends FlagListener {
*/
@EventHandler(priority = EventPriority.LOW, ignoreCancelled=true)
public void onSplashPotionSplash(final PotionSplashEvent e) {
if (e.getEntity().getShooter() instanceof Player && getPlugin().getIWM().inWorld(e.getEntity().getWorld())) {
User user = User.getInstance((Player)e.getEntity().getShooter());
if (e.getEntity().getShooter() instanceof Player p && p != null && getPlugin().getIWM().inWorld(e.getEntity().getWorld())) {
User user = User.getInstance(p);
// Is PVP allowed here?
if (this.PVPAllowed(e.getEntity().getLocation())) {
return;
@ -256,9 +255,9 @@ public class PVPListener extends FlagListener {
});
}
private void alertUser(Player player, Flag flag) {
private void alertUser(@NonNull Player player, Flag flag) {
String message = "protection.flags." + flag.getID() + ".enabled";
Objects.requireNonNull(User.getInstance(player)).sendMessage(message);
User.getInstance(player).sendMessage(message);
player.playSound(player.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER,2F, 1F);
}
}

2
src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CreeperListener.java
View File

@ -41,7 +41,7 @@ public class CreeperListener extends FlagListener {
}
// Check for griefing
Creeper creeper = (Creeper)e.getEntity();
if (!Flags.CREEPER_GRIEFING.isSetForWorld(e.getLocation().getWorld()) && creeper.getTarget() instanceof Player target) {
if (!Flags.CREEPER_GRIEFING.isSetForWorld(e.getLocation().getWorld()) && creeper.getTarget() instanceof Player target && target != null) {
if (!getIslands().locationIsOnIsland(target, e.getLocation())) {
User user = User.getInstance(target);
user.notify("protection.protected", TextVariables.DESCRIPTION, user.getTranslation(Flags.CREEPER_GRIEFING.getHintReference()));