Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2025-02-03 12:01:22 +01:00
Code Issues Projects Releases Wiki Activity

Allow admins to use the admin shop in all cases

Browse Source 
This fixes issues with the auto complete right click functionality not working with admin shops
This commit is contained in:
Phoenix616 2018-09-18 00:08:54 +01:00
parent 12d2107ce1
commit 96b5a675d6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/NameChecker.java
View File

@ -22,7 +22,7 @@ public class NameChecker implements Listener {
String name = event.getSignLine(NAME_LINE); String name = event.getSignLine(NAME_LINE);
Player player = event.getPlayer(); Player player = event.getPlayer();
if (name.isEmpty() || (!NameManager.canUseName(player, name) && !Permission.has(player, Permission.ADMIN))) { if (name.isEmpty() || !NameManager.canUseName(player, name)) {
Account account = NameManager.getAccount(player.getName()); Account account = NameManager.getAccount(player.getName());
if (account != null) { if (account != null) {
event.setSignLine(NAME_LINE, account.getShortName()); event.setSignLine(NAME_LINE, account.getShortName());

2
src/main/java/com/Acrobot/ChestShop/Signs/RestrictedSign.java
View File

@ -58,7 +58,7 @@ public class RestrictedSign implements Listener {
Sign sign = (Sign) connectedSign.getState(); Sign sign = (Sign) connectedSign.getState();
if (!ChestShopSign.canAccess(player, sign) && !Permission.has(player, ADMIN)) { if (!ChestShopSign.canAccess(player, sign)) {
dropSignAndCancelEvent(event); dropSignAndCancelEvent(event);
} }

2
src/main/java/com/Acrobot/ChestShop/UUIDs/NameManager.java
View File

@ -297,7 +297,7 @@ public class NameManager {
public static boolean canUseName(Player player, String name) { public static boolean canUseName(Player player, String name) {
if (ChestShopSign.isAdminShop(name)) { if (ChestShopSign.isAdminShop(name)) {
return false; return Permission.has(player, Permission.ADMIN);
} }
if (Permission.otherName(player, name)) { if (Permission.otherName(player, name)) {