mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2025-08-17 17:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

economy check would lock players into rtp state

Browse Source
This commit is contained in:
RonanCraft 2023-06-13 11:58:25 -04:00
parent de09261461
commit 82b2225f0e
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -7,7 +7,7 @@
<groupId>me.SuperRonanCraft</groupId> <groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTP</artifactId> <artifactId>BetterRTP</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>3.6.9-1</version> <version>3.6.9-2-DEV</version>
<!-- Upload patches to https://repo.ronanplugins.com/#/ --> <!-- Upload patches to https://repo.ronanplugins.com/#/ -->

9
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java
View File

@ -7,6 +7,7 @@ import me.SuperRonanCraft.BetterRTP.references.WarningHandler;
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_SettingUpEvent; import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_SettingUpEvent;
import me.SuperRonanCraft.BetterRTP.references.file.FileOther; import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP; 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.PermissionGroup;
import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.*; import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.*;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -81,8 +82,14 @@ public class RTP {
if (setup.isCancelled()) if (setup.isCancelled())
return; return;
// Second Economy check // Second Economy check
if (!getPl().getEco().hasBalance(pWorld.getSendi(), pWorld)) if (!getPl().getEco().hasBalance(pWorld.getSendi(), pWorld)) {
MessagesCore.FAILED_PRICE.send(pWorld.getSendi());
return; return;
}
if (!getPl().getEco().hasHunger(pWorld.getSendi(), pWorld)) {
MessagesCore.FAILED_HUNGER.send(pWorld.getSendi());
return;
}
rtp(pWorld.getSendi(), pWorld, pWorld.getRtp_type()); rtp(pWorld.getSendi(), pWorld, pWorld.getRtp_type());
} }

3
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java
View File

@ -92,6 +92,9 @@ public class RTPPlayer {
tpLoc.setPitch(player.getLocation().getPitch()); tpLoc.setPitch(player.getLocation().getPitch());
AsyncHandler.sync(() -> AsyncHandler.sync(() ->
settings.teleport.sendPlayer(sendi, player, tpLoc, worldPlayer, attempts, type)); settings.teleport.sendPlayer(sendi, player, tpLoc, worldPlayer, attempts, type));
} else {
getPl().getCooldowns().removeCooldown(player, worldPlayer.getWorld());
getPl().getpInfo().getRtping().put(player, false);
} }
} else { } else {
randomlyTeleport(sendi); randomlyTeleport(sendi);

4
src/main/resources/ideas.yml Normal file
View 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'