Merge pull request #14 from Diet-Cola/master

Fix currentMember check on password join
This commit is contained in:
Maxopoly
2020-05-04 02:30:07 +02:00
committed by GitHub

View File

@@ -1,12 +1,8 @@
package vg.civcraft.mc.namelayer.command.commands;
import java.util.List;
import java.util.UUID;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import vg.civcraft.mc.namelayer.GroupManager.PlayerType;
import vg.civcraft.mc.namelayer.NameAPI;
import vg.civcraft.mc.namelayer.NameLayerPlugin;
@@ -15,6 +11,9 @@ import vg.civcraft.mc.namelayer.group.Group;
import vg.civcraft.mc.namelayer.permission.GroupPermission;
import vg.civcraft.mc.namelayer.permission.PermissionType;
import java.util.List;
import java.util.UUID;
public class JoinGroup extends PlayerCommandMiddle{
public JoinGroup(String name) {
@@ -56,7 +55,7 @@ public class JoinGroup extends PlayerCommandMiddle{
p.sendMessage(ChatColor.RED + "Someone derped. This group does not have the specified permission to let you join, sorry.");
return true;
}
if (g.isCurrentMember(uuid, pType)){
if (g.isCurrentMember(uuid)){
p.sendMessage(ChatColor.RED + "You are already a member.");
return true;
}