diff --git a/src/main/java/net/knarcraft/stargate/event/StargateEntityPortalEvent.java b/src/main/java/net/knarcraft/stargate/event/StargateEntityPortalEvent.java index 1b6fa95..b392ee8 100644 --- a/src/main/java/net/knarcraft/stargate/event/StargateEntityPortalEvent.java +++ b/src/main/java/net/knarcraft/stargate/event/StargateEntityPortalEvent.java @@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull; public class StargateEntityPortalEvent extends StargateEvent { private static final HandlerList handlers = new HandlerList(); - Entity travellingEntity; + final Entity travellingEntity; private final Portal destination; private Location exit; diff --git a/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java b/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java index bbc6aa6..57d3ad4 100644 --- a/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java +++ b/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java @@ -102,9 +102,9 @@ public class VehicleEventListener implements Listener { } //Transfer payment if necessary - int cost = EconomyHandler.getUseCost(player, entrancePortal, destinationPortal); + int cost = EconomyHandler.getDefaultUseCost(player, entrancePortal, destinationPortal); if (cost > 0) { - if (!EconomyHelper.payTeleportFee(entrancePortal, player, cost)) { + if (EconomyHelper.cannotPayTeleportFee(entrancePortal, player, cost)) { return; } } diff --git a/src/main/java/net/knarcraft/stargate/utility/EconomyHandler.java b/src/main/java/net/knarcraft/stargate/utility/EconomyHandler.java index 33c4b1e..66cc35e 100644 --- a/src/main/java/net/knarcraft/stargate/utility/EconomyHandler.java +++ b/src/main/java/net/knarcraft/stargate/utility/EconomyHandler.java @@ -32,7 +32,7 @@ public final class EconomyHandler { * * @return

The gate use cost

*/ - public static int getUseCost() { + public static int getDefaultUseCost() { return useCost; } @@ -43,7 +43,7 @@ public final class EconomyHandler { * * @param useCost

The gate use cost

*/ - public static void setUseCost(int useCost) { + public static void setDefaultUseCost(int useCost) { if (useCost < 0) { throw new IllegalArgumentException("Using a gate cannot cost a negative amount"); } @@ -66,7 +66,7 @@ public final class EconomyHandler { * * @param createCost

The gate creation cost

*/ - public static void setCreateCost(int createCost) { + public static void setDefaultCreateCost(int createCost) { EconomyHandler.createCost = createCost; } @@ -84,7 +84,7 @@ public final class EconomyHandler { * * @param destroyCost

The gate destruction cost

*/ - public static void setDestroyCost(int destroyCost) { + public static void setDefaultDestroyCost(int destroyCost) { EconomyHandler.destroyCost = destroyCost; } @@ -99,7 +99,7 @@ public final class EconomyHandler { if (skipPayment(cost)) { return true; } - // Charge player + //Charge player return EconomyHandler.chargePlayer(player, cost); } @@ -115,7 +115,7 @@ public final class EconomyHandler { if (skipPayment(cost)) { return true; } - // Charge player + //Charge player return EconomyHandler.chargePlayer(player, target, cost); } @@ -143,7 +143,7 @@ public final class EconomyHandler { if (!economyEnabled) { return false; } - // Check for Vault + //Check if vault is loaded Plugin vault = pluginManager.getPlugin("Vault"); if (vault != null && vault.isEnabled()) { RegisteredServiceProvider economyProvider = Stargate.server.getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class); @@ -188,7 +188,7 @@ public final class EconomyHandler { * @param destination

The destination portal

* @return

The cost of using the portal

*/ - public static int getUseCost(Player player, Portal source, Portal destination) { + public static int getDefaultUseCost(Player player, Portal source, Portal destination) { //No payment required if (!EconomyHandler.useEconomy() || source.getOptions().isFree()) { return 0; diff --git a/src/main/java/net/knarcraft/stargate/utility/EconomyHelper.java b/src/main/java/net/knarcraft/stargate/utility/EconomyHelper.java index 2b0d34b..68ffcff 100644 --- a/src/main/java/net/knarcraft/stargate/utility/EconomyHelper.java +++ b/src/main/java/net/knarcraft/stargate/utility/EconomyHelper.java @@ -19,9 +19,9 @@ public final class EconomyHelper { * @param entrancePortal

The portal the player is entering

* @param player

The player wishing to teleport

* @param cost

The cost of teleportation

- * @return

True if payment was successful

+ * @return

False if payment was successful. True if the payment was unsuccessful

*/ - public static boolean payTeleportFee(Portal entrancePortal, Player player, int cost) { + public static boolean cannotPayTeleportFee(Portal entrancePortal, Player player, int cost) { boolean success; //Try to charge the player @@ -36,7 +36,7 @@ public final class EconomyHelper { if (!success) { sendInsufficientFundsMessage(entrancePortal.getName(), player, cost); entrancePortal.close(false); - return false; + return true; } //Send the deduct-message to the player @@ -55,7 +55,7 @@ public final class EconomyHelper { sendObtainMessage(entrancePortal.getName(), gateOwner, cost); } } - return true; + return false; } /** diff --git a/src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java b/src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java index 3be876d..6038151 100644 --- a/src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java +++ b/src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java @@ -405,9 +405,9 @@ public final class PermissionHelper { } //Player cannot pay for teleportation - int cost = EconomyHandler.getUseCost(player, entrancePortal, destination); + int cost = EconomyHandler.getDefaultUseCost(player, entrancePortal, destination); if (cost > 0) { - return !EconomyHelper.payTeleportFee(entrancePortal, player, cost); + return EconomyHelper.cannotPayTeleportFee(entrancePortal, player, cost); } return false; }