EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Moves some code from Stargate to EconomyHandler

Browse Source
This commit is contained in:
Kristian Knarvik
2021-09-19 15:05:19 +02:00
parent b191ac1de5
commit 8835e69e3c
8 changed files with 166 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/knarcraft/stargate/portal/Gate.java
View File

@ -161,7 +161,7 @@ public class Gate {
* @return <p>The cost of creating a portal with this gate</p>
*/
public Integer getCreateCost() {
return createCost < 0 ? EconomyHandler.getCreateCost() : createCost;
return createCost < 0 ? EconomyHandler.getDefaultCreateCost() : createCost;
}
/**
@ -170,8 +170,7 @@ public class Gate {
* @return <p>The cost of destroying a portal with this gate</p>
*/
public Integer getDestroyCost() {
if (destroyCost < 0) return EconomyHandler.getDestroyCost();
return destroyCost;
return destroyCost < 0 ? EconomyHandler.getDefaultDestroyCost() : destroyCost;
}
/**

5
src/main/java/net/knarcraft/stargate/portal/PortalHandler.java
View File

@ -6,6 +6,7 @@ import net.knarcraft.stargate.Stargate;
import net.knarcraft.stargate.container.TwoTuple;
import net.knarcraft.stargate.event.StargateCreateEvent;
import net.knarcraft.stargate.utility.DirectionHelper;
import net.knarcraft.stargate.utility.EconomyHandler;
import net.knarcraft.stargate.utility.EconomyHelper;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@ -395,7 +396,7 @@ public class PortalHandler {
portal = new Portal(topLeft, modX, modZ, yaw, id, button, destinationName, name, false, network,
gate, player.getUniqueId(), player.getName(), portalOptions);
int cost = Stargate.getCreateCost(player, gate);
int cost = EconomyHandler.getCreateCost(player, gate);
// Call StargateCreateEvent
StargateCreateEvent cEvent = new StargateCreateEvent(player, portal, event.getLines(), deny, denyMsg, cost);
@ -440,7 +441,7 @@ public class PortalHandler {
}
if (cost > 0) {
if (!Stargate.chargePlayer(player, cost)) {
if (!EconomyHandler.chargePlayerIfNecessary(player, cost)) {
EconomyHelper.sendInsufficientFundsMessage(name, player, cost);
Stargate.debug("createPortal", "Insufficient Funds");
return null;