From bb90d6e347fc2aa8b3550b3bb1954470e81f165f Mon Sep 17 00:00:00 2001
From: SuperRonanCraft <superronancraft@gmail.com>
Date: Fri, 24 Jul 2020 00:33:02 -0400
Subject: [PATCH] normalization

---
 .../java/me/SuperRonanCraft/BetterRTP/player/Delay.java     | 4 ++--
 src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java  | 3 ++-
 .../SuperRonanCraft/BetterRTP/player/commands/Commands.java | 6 +++---
 .../BetterRTP/player/commands/types/CmdHelp.java            | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/Delay.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/Delay.java
index e6f91ca..a8d3991 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/Delay.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/Delay.java
@@ -14,8 +14,8 @@ import org.bukkit.event.player.PlayerMoveEvent;
 
 class Delay implements Listener {
     private int run;
-    private PlayerWorld pWorld;
-    private boolean cancelOnMove, cancelOnDamage;
+    private final PlayerWorld pWorld;
+    private final boolean cancelOnMove, cancelOnDamage;
 
     Delay(CommandSender sendi, PlayerWorld pWorld, int delay, boolean cancelOnMove, boolean cancelOnDamage) {
         this.pWorld = pWorld;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java
index 1b97443..f491f75 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java
@@ -125,6 +125,7 @@ public class RTP {
             world = p.getWorld().getName();
         if (overriden.containsKey(world))
             world = overriden.get(world);
+        // Not forced and has 'betterrtp.world.<world>'
         if (sendi == p && !pl.getPerms().getAWorld(sendi, world)) {
             pl.getCmd().cooldowns.remove(p.getUniqueId());
             pl.getText().getNoPermissionWorld(p, world);
@@ -143,7 +144,7 @@ public class RTP {
             return;
         }
         PlayerWorld pWorld = new PlayerWorld(p, world);
-        //Set all methods
+        // Set all methods
         if (customWorlds.containsKey(world)) {
             RTPWorld cWorld = customWorlds.get(pWorld.getWorld());
             pWorld.setup(cWorld, cWorld.getPrice(), biomes);
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java
index 4339605..55514dd 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java
@@ -13,7 +13,7 @@ import java.util.UUID;
 
 public class Commands {
 
-    private Main pl;
+    private final Main pl;
     public HashMap<UUID, Long> cooldowns = new HashMap<>();
     public HashMap<UUID, Boolean> rtping = new HashMap<>();
     private boolean cooldownTimer;
@@ -118,7 +118,7 @@ public class Commands {
     }
 
     public void tp(Player player, CommandSender sendi, String world, List<String> biomes) {
-        if (canRtp(sendi, player)) {
+        if (checkDelay(sendi, player)) {
             boolean delay = false;
             if (!pl.getPerms().getBypassDelay(player))
                 if (timer != 0)
@@ -128,7 +128,7 @@ public class Commands {
         }
     }
 
-    private boolean canRtp(CommandSender sendi, Player player) {
+    private boolean checkDelay(CommandSender sendi, Player player) {
         //Bypassing/Forced?
         if (sendi != player || pl.getPerms().getBypassCooldown(player))
             return true;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java
index 9c774b8..5af56c8 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdHelp.java
@@ -15,7 +15,7 @@ public class CmdHelp implements RTPCommand {
         if (pl.getPerms().getRtpOther(sendi))
             pl.getText().getHelpPlayer(sendi, label);
         if (sendi instanceof Player) {
-            if (pl.getPerms().getAWorld(sendi, null))
+            if (pl.getPerms().getWorld(sendi))
                 pl.getText().getHelpWorld(sendi, label);
         } else
             pl.getText().getHelpWorld(sendi, label);