economy check would lock players into rtp state

RonanPlugins · Jun 13, 2023 · 82b2225 · 82b2225
1 parent de09261
commit 82b2225
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>me.SuperRonanCraft</groupId>
     <artifactId>BetterRTP</artifactId>
     <packaging>jar</packaging>
-    <version>3.6.9-1</version>
+    <version>3.6.9-2-DEV</version>
 
     <!-- Upload patches to https://repo.ronanplugins.com/#/ -->
 

diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java
@@ -7,6 +7,7 @@
 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 void start(WorldPlayer pWorld) {
         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());
     }
 

diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java
@@ -92,6 +92,9 @@ private void attempt(CommandSender sendi, Location loc) {
                 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);

diff --git a/src/main/resources/ideas.yml b/src/main/resources/ideas.yml
@@ -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'