cooldown can be set per world type + addons fix

This commit is contained in:
RonanCraft
2022-04-12 14:51:35 -04:00
parent 201f645c43
commit 5ebee9590b
15 changed files with 77 additions and 21 deletions

View File

@@ -7,7 +7,7 @@
<groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTPAddons</artifactId>
<packaging>jar</packaging>
<version>1.8.2</version>
<version>1.8.3</version>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -109,7 +109,7 @@
<dependency>
<groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTP</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
<scope>provided</scope>
</dependency>
<!-- ProtocolLib -->

View File

@@ -91,7 +91,7 @@ public class AddonRTPMenu implements Addon, Listener {
if (validClick(e)) {
e.setCancelled(true);
MenuData data = getData((Player) e.getWhoClicked());
CmdTeleport.teleport(e.getWhoClicked(), "rtp", data.getWorldSlots().get(e.getSlot()).getName(), null);
CmdTeleport.teleport(e.getWhoClicked(), "rtp", data.getWorldSlots().get(e.getSlot()), null);
e.getWhoClicked().closeInventory();
}
}

View File

@@ -2,6 +2,7 @@ package me.SuperRonanCraft.BetterRTPAddons.addons.rtpmenu;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.types.CmdTeleport;
import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
import me.SuperRonanCraft.BetterRTPAddons.util.Files;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit;
@@ -23,7 +24,7 @@ public class RTPMenu_SelectWorld {
List<World> bukkit_worlds = Bukkit.getWorlds();
List<World> actual_worlds = new ArrayList<>();
for (World world : bukkit_worlds) {
if (pl.getWorlds().containsKey(world.getName()) && BetterRTP.getInstance().getPerms().getAWorld(p, world.getName()))
if (pl.getWorlds().containsKey(world.getName()) && PermissionNode.getAWorld(p, world.getName()))
actual_worlds.add(world);
}
if (actual_worlds.isEmpty() || (actual_worlds.size() <= 1 && !BetterRTP.getInstance().getSettings().isDebug())) {