Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2025-01-20 21:31:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

sponge: Fix permission lookups for 'any'.

Browse Source 
* Fix '/cf' command when using modid:any.
* Improve sponge playerdata migration.
This commit is contained in:
bloodshot 2019-12-28 15:34:17 -05:00
parent 69cb3c6728
commit 501c303775
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sponge/src/main/java/com/griefdefender/command/CommandHelper.java
View File

@ -242,9 +242,7 @@ public static PermissionResult addFlagPermission(CommandSource src, GDPermission
} }
String[] parts = target.split(":"); String[] parts = target.split(":");
if (parts.length > 1 && parts[1].equalsIgnoreCase("any")) { if (parts.length <= 1 || !parts[1].equalsIgnoreCase("any")) {
target = baseFlag + "." + parts[0];
} else {
// check for meta // check for meta
parts = target.split("\\."); parts = target.split("\\.");
String targetFlag = parts[0]; String targetFlag = parts[0];

11
sponge/src/main/java/com/griefdefender/migrator/GPSpongeMigrator.java
View File

@ -37,6 +37,7 @@
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.HashSet; import java.util.HashSet;
@ -63,9 +64,15 @@ public class GPSpongeMigrator {
public void migrateData() { public void migrateData() {
try { try {
FileUtils.copyDirectory(GP_GLOBAL_PLAYER_DATA_PATH.toFile(), GD_DATA_ROOT_PATH.resolve("GlobalPlayerData").toFile(), true); if (Files.exists(GP_GLOBAL_PLAYER_DATA_PATH)) {
if (Files.isDirectory(GP_GLOBAL_PLAYER_DATA_PATH)) {
FileUtils.copyDirectory(GP_GLOBAL_PLAYER_DATA_PATH.toFile(), GD_DATA_ROOT_PATH.resolve("GlobalPlayerData").toFile(), true);
} else {
// Support symlinks
FileUtils.copyFile(GP_GLOBAL_PLAYER_DATA_PATH.toFile(), GD_DATA_ROOT_PATH.resolve("GlobalPlayerData").toFile(), true);
}
}
FileUtils.copyDirectory(GP_CLAIM_DATA_PATH.toFile(), GD_DATA_ROOT_PATH.resolve("worlds").toFile(), true); FileUtils.copyDirectory(GP_CLAIM_DATA_PATH.toFile(), GD_DATA_ROOT_PATH.resolve("worlds").toFile(), true);
//FileUtils.copyFile(GP_GLOBAL_CONFIG.toFile(), GD_DATA_ROOT_PATH.resolve("global.conf").toFile());
} catch (IOException e1) { } catch (IOException e1) {
e1.printStackTrace(); e1.printStackTrace();
} }

4
sponge/src/main/java/com/griefdefender/permission/GDPermissionManager.java
View File

@ -983,12 +983,16 @@ private Set<Context> populateEventSourceTargetContext(Set<Context> contexts, Str
if (!id.contains(":")) { if (!id.contains(":")) {
id = "minecraft:" + id; id = "minecraft:" + id;
} }
final String[] parts = id.split(":");
final String modId = parts[0];
if (isSource) { if (isSource) {
this.eventSourceId = id.toLowerCase(); this.eventSourceId = id.toLowerCase();
contexts.add(new Context("source", this.eventSourceId)); contexts.add(new Context("source", this.eventSourceId));
contexts.add(new Context("source", modId + ":any"));
} else { } else {
this.eventTargetId = id.toLowerCase(); this.eventTargetId = id.toLowerCase();
contexts.add(new Context("target", this.eventTargetId)); contexts.add(new Context("target", this.eventTargetId));
contexts.add(new Context("target", modId + ":any"));
} }
return contexts; return contexts;
} }