diff --git a/pom.xml b/pom.xml
index 797ae36..0dbf438 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
me.SuperRonanCraft
BetterRTP
jar
- 3.6.9-1
+ 3.6.9-2-DEV
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP.java
index 4a3af92..5343977 100644
--- 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.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());
}
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPlayer.java
index 916215c..9c1bf33 100644
--- 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 @@ 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);
diff --git a/src/main/resources/ideas.yml b/src/main/resources/ideas.yml
new file mode 100644
index 0000000..f95c17c
--- /dev/null
+++ b/src/main/resources/ideas.yml
@@ -0,0 +1,4 @@
+#Add flags to `/rtp player ` command
+ignore_cooldown: 'ignores current cooldown delay'
+ignore_hunger: 'no hunger checks/charge'
+ignore_economy: 'no price deducted from bank'
\ No newline at end of file