mirror of
https://github.com/RonanPlugins/BetterRTP.git
synced 2026-02-16 10:30:58 +00:00
economy check would lock players into rtp state
This commit is contained in:
@@ -7,6 +7,7 @@ import me.SuperRonanCraft.BetterRTP.references.WarningHandler;
|
||||
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_SettingUpEvent;
|
||||
import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
|
||||
import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP;
|
||||
import me.SuperRonanCraft.BetterRTP.references.messages.MessagesCore;
|
||||
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.PermissionGroup;
|
||||
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.*;
|
||||
import org.bukkit.Bukkit;
|
||||
@@ -81,8 +82,14 @@ public class RTP {
|
||||
if (setup.isCancelled())
|
||||
return;
|
||||
// Second Economy check
|
||||
if (!getPl().getEco().hasBalance(pWorld.getSendi(), pWorld))
|
||||
if (!getPl().getEco().hasBalance(pWorld.getSendi(), pWorld)) {
|
||||
MessagesCore.FAILED_PRICE.send(pWorld.getSendi());
|
||||
return;
|
||||
}
|
||||
if (!getPl().getEco().hasHunger(pWorld.getSendi(), pWorld)) {
|
||||
MessagesCore.FAILED_HUNGER.send(pWorld.getSendi());
|
||||
return;
|
||||
}
|
||||
rtp(pWorld.getSendi(), pWorld, pWorld.getRtp_type());
|
||||
}
|
||||
|
||||
|
||||
@@ -92,6 +92,9 @@ public class RTPPlayer {
|
||||
tpLoc.setPitch(player.getLocation().getPitch());
|
||||
AsyncHandler.sync(() ->
|
||||
settings.teleport.sendPlayer(sendi, player, tpLoc, worldPlayer, attempts, type));
|
||||
} else {
|
||||
getPl().getCooldowns().removeCooldown(player, worldPlayer.getWorld());
|
||||
getPl().getpInfo().getRtping().put(player, false);
|
||||
}
|
||||
} else {
|
||||
randomlyTeleport(sendi);
|
||||
|
||||
4
src/main/resources/ideas.yml
Normal file
4
src/main/resources/ideas.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
#Add flags to `/rtp player <player>` command
|
||||
ignore_cooldown: 'ignores current cooldown delay'
|
||||
ignore_hunger: 'no hunger checks/charge'
|
||||
ignore_economy: 'no price deducted from bank'
|
||||
Reference in New Issue
Block a user