Skip to content

Commit 9f17fee

Browse files
committed
Fix permissions issue
1 parent 0ec14b9 commit 9f17fee

3 files changed

Lines changed: 13 additions & 20 deletions

File tree

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>simplexity</groupId>
88
<artifactId>SimpleNicks</artifactId>
9-
<version>2.0.0</version>
9+
<version>2.0.1</version>
1010
<packaging>jar</packaging>
1111

1212
<name>SimpleNicks</name>
@@ -23,8 +23,8 @@
2323
<artifactId>maven-compiler-plugin</artifactId>
2424
<version>3.8.1</version>
2525
<configuration>
26-
<source>16</source>
27-
<target>16</target>
26+
<source>21</source>
27+
<target>21</target>
2828
</configuration>
2929
</plugin>
3030
<plugin>
@@ -79,7 +79,7 @@
7979
<dependency>
8080
<groupId>io.papermc.paper</groupId>
8181
<artifactId>paper-api</artifactId>
82-
<version>1.20.4-R0.1-SNAPSHOT</version>
82+
<version>1.21-R0.1-SNAPSHOT</version>
8383
<scope>provided</scope>
8484
</dependency>
8585
<dependency>

src/main/java/simplexity/simplenicks/commands/Set.java

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
20+
import java.util.logging.Logger;
2021
import java.util.regex.Pattern;
2122

2223
public class Set extends SubCommand {
23-
MiniMessage serializer = MiniMessage.builder().tags(TagResolver.empty()).build();
24+
Logger logger = SimpleNicks.getSimpleNicksLogger();
2425

2526
public Set(String commandName, Permission basicPermission, Permission adminPermission, boolean consoleRunNoPlayer) {
2627
super(commandName, basicPermission, adminPermission, consoleRunNoPlayer);
@@ -76,8 +77,6 @@ private boolean setPlayerNick(Player player, Component nickComponent) {
7677
}
7778

7879

79-
80-
8180
@Override
8281
public ArrayList<String> tabComplete(CommandSender sender, String[] args, Player player) {
8382
if (player == null) {
@@ -90,26 +89,21 @@ public ArrayList<String> tabComplete(CommandSender sender, String[] args, Player
9089
private Component getNickComponent(CommandSender user, String nick) {
9190
int permissionCount = 0;
9291
String strippedMessage = miniMessage.stripTags(nick);
93-
TagResolver.Builder resolverBuilder = TagResolver.builder();
94-
Component finalNick = null;
92+
TagResolver.Builder resolver = TagResolver.builder();
9593
for (TagPermission tagPermission : TagPermission.values()) {
96-
if (!user.hasPermission(tagPermission.getPermission())) {
97-
continue;
94+
if (user.hasPermission(tagPermission.getPermission())) {
95+
permissionCount++;
96+
resolver.resolver(tagPermission.getTagResolver());
9897
}
99-
permissionCount++;
100-
resolverBuilder.resolver(tagPermission.getTagResolver());
101-
finalNick = serializer.deserialize(nick, tagPermission.getTagResolver());
10298
}
10399
if (permissionCount == 0) {
104100
return Component.text(strippedMessage);
105101
}
106-
String plainNick = PlainTextComponentSerializer.plainText().serialize(finalNick);
107-
if (!plainNick.equals(strippedMessage)) {
108-
return null;
109-
}
110-
return finalNick;
102+
MiniMessage parser = MiniMessage.builder().tags(resolver.build()).build();
103+
return parser.deserialize(nick);
111104
}
112105

106+
113107
private boolean passesChecks(CommandSender sender, String nickname, Player player) {
114108
String strippedMessage = miniMessage.stripTags(nickname);
115109
Pattern regexPattern = ConfigHandler.getInstance().getRegex();

src/main/java/simplexity/simplenicks/commands/SubCommand.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public abstract class SubCommand {
1717
public final Permission adminPermission;
1818
public final boolean canRunWithoutPlayer;
1919
public final MiniMessage miniMessage = SimpleNicks.getMiniMessage();
20-
2120
public SubCommand(String commandName, Permission basicPermission, Permission adminPermission, boolean consoleRunNoPlayer) {
2221
this.commandName = commandName;
2322
this.basicPermission = basicPermission;

0 commit comments

Comments
 (0)