Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-06-26 06:14:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.12' into 1.13

Browse Source
This commit is contained in:
Phoenix616 2018-09-18 00:09:07 +01:00
commit 39a522716f
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);
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());
if (account != null) {
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();
if (!ChestShopSign.canAccess(player, sign) && !Permission.has(player, ADMIN)) {
if (!ChestShopSign.canAccess(player, sign)) {
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) {
if (ChestShopSign.isAdminShop(name)) {
return false;
return Permission.has(player, Permission.ADMIN);
}
if (Permission.otherName(player, name)) {