mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2026-02-16 02:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

permission fixes...

Browse Source
This commit is contained in:
SuperRonanCraft
2023-04-09 23:41:37 -04:00
parent 32bc0d6e36
commit fd6002526d
23 changed files with 143 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BetterRTPAddons/pom.xml
View File

@@ -7,7 +7,7 @@
<groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTPAddons</artifactId>
<packaging>jar</packaging>
<version>1.8.5</version>
<version>1.8.6</version>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
@@ -109,7 +109,7 @@
<dependency>
<groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTP</artifactId>
<version>3.6.3</version>
<version>3.6.6</version>
<scope>provided</scope>
</dependency>
<!-- ProtocolLib -->

5
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/AddonsCommand.java
View File

@@ -3,6 +3,7 @@ package me.SuperRonanCraft.BetterRTPAddons;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
import me.SuperRonanCraft.BetterRTP.references.messages.MessagesCore;
import me.SuperRonanCraft.BetterRTP.references.messages.MessagesHelp;
import me.SuperRonanCraft.BetterRTPAddons.addons.portals.cmds.PortalsCommandsTabable;
@@ -65,8 +66,8 @@ public class AddonsCommand implements RTPCommand, RTPCommandHelpable {
}
@Override
public boolean permission(CommandSender sendi) {
return true;
public PermissionNode permission() {
return PermissionNode.USE;
}
@Override

24
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/PermissionNodeAddon.java Normal file
View File

@@ -0,0 +1,24 @@
package me.SuperRonanCraft.BetterRTPAddons;
import lombok.Getter;
import me.SuperRonanCraft.BetterRTP.references.PermissionCheck;
import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
public enum PermissionNodeAddon implements PermissionCheck {
PORTALS("addon.portals"),
MAGICSTICK("addon.magicstick"),
PARTY("addon.party"),
;
@Getter private final String node;
PermissionNodeAddon(String node) {
this.node = PermissionCheck.getPrefix() + node;
}
@Override public boolean isDev() {
return false;
}
}

7
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/interfaces/InterfaceCommand.java
View File

@@ -3,6 +3,9 @@ package me.SuperRonanCraft.BetterRTPAddons.addons.interfaces;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
import me.SuperRonanCraft.BetterRTP.references.PermissionCheck;
import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
import me.SuperRonanCraft.BetterRTPAddons.PermissionNodeAddon;
import me.SuperRonanCraft.BetterRTPAddons.addons.portals.cmds.PortalsCommand_Create;
import me.SuperRonanCraft.BetterRTPAddons.addons.portals.cmds.PortalsCommand_Loc1;
import me.SuperRonanCraft.BetterRTPAddons.addons.portals.cmds.PortalsCommand_Loc2;
@@ -33,8 +36,8 @@ public class InterfaceCommand implements RTPCommand, RTPCommandHelpable {
}
@Override
public boolean permission(CommandSender sendi) {
return BetterRTP.getInstance().getPerms().checkPerm("betterrtp.addon.portals", sendi);
public PermissionCheck permission() {
return PermissionNodeAddon.PORTALS;
}
@Override

6
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/magicStick/cmds/MagicStickCommand.java
View File

@@ -3,6 +3,8 @@ package me.SuperRonanCraft.BetterRTPAddons.addons.magicStick.cmds;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
import me.SuperRonanCraft.BetterRTP.references.PermissionCheck;
import me.SuperRonanCraft.BetterRTPAddons.PermissionNodeAddon;
import me.SuperRonanCraft.BetterRTPAddons.addons.magicStick.AddonMagicStick;
import org.bukkit.command.CommandSender;
@@ -46,8 +48,8 @@ public class MagicStickCommand implements RTPCommand, RTPCommandHelpable {
}
@Override
public boolean permission(CommandSender sendi) {
return BetterRTP.getInstance().getPerms().checkPerm("betterrtp.addon.magicstick", sendi);
public PermissionCheck permission() {
return PermissionNodeAddon.MAGICSTICK;
}
@Override

2
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/PartyData.java
View File

@@ -94,7 +94,7 @@ public class PartyData {
String.valueOf(loc.getBlockZ()),
loc.getWorld().getName(),
1);*/
BetterRTP.getInstance().getRTP().getTeleport().afterTeleport(p, loc, 0, 0, e.getOldLocation(), e.getType());
BetterRTP.getInstance().getRTP().getTeleport().afterTeleport(p, loc, e.getWorldPlayer(), 0, e.getOldLocation(), e.getType());
});
//Set cooldowns
if (!PermissionNode.BYPASS_COOLDOWN.check(p)) {

7
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/parties/cmds/PartyCommand.java
View File

@@ -1,8 +1,9 @@
package me.SuperRonanCraft.BetterRTPAddons.addons.parties.cmds;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
import me.SuperRonanCraft.BetterRTP.references.PermissionCheck;
import me.SuperRonanCraft.BetterRTPAddons.PermissionNodeAddon;
import me.SuperRonanCraft.BetterRTPAddons.addons.parties.AddonParty;
import org.bukkit.command.CommandSender;
@@ -55,8 +56,8 @@ public class PartyCommand implements RTPCommand, RTPCommandHelpable {
}
@Override
public boolean permission(CommandSender sendi) {
return BetterRTP.getInstance().getPerms().checkPerm("betterrtp.addon.portals", sendi);
public PermissionCheck permission() {
return PermissionNodeAddon.PARTY;
}
@Override

7
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/portals/cmds/PortalsCommand.java
View File

@@ -1,8 +1,9 @@
package me.SuperRonanCraft.BetterRTPAddons.addons.portals.cmds;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommandHelpable;
import me.SuperRonanCraft.BetterRTP.references.PermissionCheck;
import me.SuperRonanCraft.BetterRTPAddons.PermissionNodeAddon;
import me.SuperRonanCraft.BetterRTPAddons.addons.portals.AddonPortals;
import org.bukkit.command.CommandSender;
@@ -54,8 +55,8 @@ public class PortalsCommand implements RTPCommand, RTPCommandHelpable {
}
@Override
public boolean permission(CommandSender sendi) {
return BetterRTP.getInstance().getPerms().checkPerm("betterrtp.addon.portals", sendi);
public PermissionCheck permission() {
return PermissionNodeAddon.PORTALS;
}
@Override

3
BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/rtpmenu/RTPMenu_SelectWorld.java
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.PermissionCheck;
import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
import me.SuperRonanCraft.BetterRTP.references.messages.Message;
import me.SuperRonanCraft.BetterRTPAddons.util.Files;
@@ -26,7 +27,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()) && PermissionNode.getAWorld(p, world.getName()))
if (pl.getWorlds().containsKey(world.getName()) && PermissionCheck.getAWorld(p, world.getName()))
actual_worlds.add(world);
}
if (actual_worlds.isEmpty() || (actual_worlds.size() <= 1 && !BetterRTP.getInstance().getSettings().isDebug())) {