Skip to content

Commit cc25a79

Browse files
authored
Fix player commands option not working (#6214)
Fixes regression from 8d44d1a
1 parent e39b614 commit cc25a79

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Essentials/src/main/java/com/earth2me/essentials/metrics/MetricsWrapper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ private void addPermsChart() {
5252
final Map<String, Map<String, Integer>> result = new HashMap<>();
5353
final String handler = ess.getPermissionsHandler().getName();
5454
final Map<String, Integer> backend = new HashMap<>();
55-
backend.put(ess.getPermissionsHandler().getBackendName(), 1);
55+
final String backendName = ess.getPermissionsHandler().getBackendName();
56+
backend.put(backendName != null ? backendName : "Other", 1);
5657
result.put(handler, backend);
5758
return result;
5859
}));

Essentials/src/main/java/com/earth2me/essentials/perm/PermissionsHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@ public void checkPermissions() {
198198
String enabledPermsPlugin = ((AbstractVaultHandler) handler).getEnabledPermsPlugin();
199199
if (enabledPermsPlugin == null) enabledPermsPlugin = "generic";
200200
ess.getLogger().info("Using Vault based permissions (" + enabledPermsPlugin + ")");
201+
} else if (handler.getClass() == ConfigPermissionsHandler.class) {
202+
ess.getLogger().info("Using config file enhanced permissions.");
203+
ess.getLogger().info("Permissions listed in as player-commands will be given to all users.");
201204
} else if (handler.getClass() == SuperpermsHandler.class) {
202205
if (handler.tryProvider(ess)) {
203206
ess.getLogger().warning("Detected supported permissions plugin " +
@@ -206,9 +209,6 @@ public void checkPermissions() {
206209
"work until you install Vault.");
207210
}
208211
ess.getLogger().info("Using superperms-based permissions.");
209-
} else if (handler.getClass() == ConfigPermissionsHandler.class) {
210-
ess.getLogger().info("Using config file enhanced permissions.");
211-
ess.getLogger().info("Permissions listed in as player-commands will be given to all users.");
212212
}
213213
}
214214

Essentials/src/main/java/com/earth2me/essentials/perm/impl/SuperpermsHandler.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@ public String getEnabledPermsPlugin() {
171171
}
172172
}
173173

174-
if (enabledPermsPlugin == null) {
175-
enabledPermsPlugin = "Other";
176-
}
177-
178174
return enabledPermsPlugin;
179175
}
180176
}

0 commit comments

Comments
 (0)