mirror of
https://github.com/Multiverse/Multiverse-Core.git
synced 2024-10-01 16:47:29 +02:00
Remove the editwhite/blacklist garbage.
This commit is contained in:
parent
8c8a0b713a
commit
b7fd8f970b
@ -77,9 +77,6 @@ public class MVConfigMigrator {
|
|||||||
migrateListItem(newConfig, oldConfig, key, ".worldBlacklist", ".worldblacklist");
|
migrateListItem(newConfig, oldConfig, key, ".worldBlacklist", ".worldblacklist");
|
||||||
migrateListItem(newConfig, oldConfig, key, ".playerBlacklist", ".playerblacklist");
|
migrateListItem(newConfig, oldConfig, key, ".playerBlacklist", ".playerblacklist");
|
||||||
migrateListItem(newConfig, oldConfig, key, ".playerWhitelist", ".playerwhitelist");
|
migrateListItem(newConfig, oldConfig, key, ".playerWhitelist", ".playerwhitelist");
|
||||||
migrateListItem(newConfig, oldConfig, key, ".editBlacklist", ".editblacklist");
|
|
||||||
migrateListItem(newConfig, oldConfig, key, ".editWhitelist", ".editwhitelist");
|
|
||||||
|
|
||||||
}
|
}
|
||||||
newConfig.save();
|
newConfig.save();
|
||||||
return true;
|
return true;
|
||||||
|
@ -127,8 +127,16 @@ public class MVWorld {
|
|||||||
this.getPlayerBlacklist().addAll(config.getStringList("worlds." + this.name + ".playerblacklist", new ArrayList<String>()));
|
this.getPlayerBlacklist().addAll(config.getStringList("worlds." + this.name + ".playerblacklist", new ArrayList<String>()));
|
||||||
this.getWorldBlacklist().addAll(config.getStringList("worlds." + this.name + ".worldblacklist", new ArrayList<String>()));
|
this.getWorldBlacklist().addAll(config.getStringList("worlds." + this.name + ".worldblacklist", new ArrayList<String>()));
|
||||||
this.getBlockBlacklist().addAll(config.getIntList("worlds." + this.name + ".blockblacklist", new ArrayList<Integer>()));
|
this.getBlockBlacklist().addAll(config.getIntList("worlds." + this.name + ".blockblacklist", new ArrayList<Integer>()));
|
||||||
this.getEditWhitelist().addAll(config.getStringList("worlds." + this.name + ".editwhitelist", new ArrayList<String>()));
|
this.translateTempSpawn(config);
|
||||||
this.getEditBlacklist().addAll(config.getStringList("worlds." + this.name + ".editblacklist", new ArrayList<String>()));
|
|
||||||
|
config.save();
|
||||||
|
// The following 3 lines will add some sample data to new worlds created.
|
||||||
|
// if (config.getIntList("worlds." + name + ".blockBlacklist", new ArrayList<Integer>()).size() == 0) {
|
||||||
|
// addSampleData();
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
private void translateTempSpawn(Configuration config) {
|
||||||
String tempspawn = config.getString("worlds." + this.name + ".tempspawn", "");
|
String tempspawn = config.getString("worlds." + this.name + ".tempspawn", "");
|
||||||
if (tempspawn.length() > 0) {
|
if (tempspawn.length() > 0) {
|
||||||
String[] coordsString = tempspawn.split(":");
|
String[] coordsString = tempspawn.split(":");
|
||||||
@ -149,12 +157,6 @@ public class MVWorld {
|
|||||||
|
|
||||||
this.config.removeProperty("worlds." + this.name + ".tempspawn");
|
this.config.removeProperty("worlds." + this.name + ".tempspawn");
|
||||||
}
|
}
|
||||||
|
|
||||||
config.save();
|
|
||||||
// The following 3 lines will add some sample data to new worlds created.
|
|
||||||
// if (config.getIntList("worlds." + name + ".blockBlacklist", new ArrayList<Integer>()).size() == 0) {
|
|
||||||
// addSampleData();
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getColoredWorldString() {
|
public String getColoredWorldString() {
|
||||||
@ -196,8 +198,6 @@ public class MVWorld {
|
|||||||
// Only int list, we don't need to add it to the masterlist
|
// Only int list, we don't need to add it to the masterlist
|
||||||
this.masterList.put("playerwhitelist", new ArrayList<String>());
|
this.masterList.put("playerwhitelist", new ArrayList<String>());
|
||||||
this.masterList.put("playerblacklist", new ArrayList<String>());
|
this.masterList.put("playerblacklist", new ArrayList<String>());
|
||||||
this.masterList.put("editwhitelist", new ArrayList<String>());
|
|
||||||
this.masterList.put("editblacklist", new ArrayList<String>());
|
|
||||||
this.masterList.put("worldblacklist", new ArrayList<String>());
|
this.masterList.put("worldblacklist", new ArrayList<String>());
|
||||||
this.masterList.put("animals", new ArrayList<String>());
|
this.masterList.put("animals", new ArrayList<String>());
|
||||||
this.masterList.put("monsters", new ArrayList<String>());
|
this.masterList.put("monsters", new ArrayList<String>());
|
||||||
@ -216,12 +216,6 @@ public class MVWorld {
|
|||||||
this.getPlayerBlacklist().add("Rigby90");
|
this.getPlayerBlacklist().add("Rigby90");
|
||||||
this.getPlayerBlacklist().add("g:Banned");
|
this.getPlayerBlacklist().add("g:Banned");
|
||||||
|
|
||||||
this.getEditWhitelist().add("fernferret");
|
|
||||||
this.getEditWhitelist().add("g:Admins");
|
|
||||||
|
|
||||||
this.getEditBlacklist().add("Rigby90");
|
|
||||||
this.getEditBlacklist().add("g:Banned");
|
|
||||||
|
|
||||||
this.getWorldBlacklist().add("world5");
|
this.getWorldBlacklist().add("world5");
|
||||||
this.getWorldBlacklist().add("A world with spaces");
|
this.getWorldBlacklist().add("A world with spaces");
|
||||||
|
|
||||||
@ -230,8 +224,6 @@ public class MVWorld {
|
|||||||
this.config.setProperty("worlds." + this.name + ".blockblacklist", this.getBlockBlacklist());
|
this.config.setProperty("worlds." + this.name + ".blockblacklist", this.getBlockBlacklist());
|
||||||
this.config.setProperty("worlds." + this.name + ".playerwhitelist", this.getPlayerWhitelist());
|
this.config.setProperty("worlds." + this.name + ".playerwhitelist", this.getPlayerWhitelist());
|
||||||
this.config.setProperty("worlds." + this.name + ".playerblacklist", this.getPlayerBlacklist());
|
this.config.setProperty("worlds." + this.name + ".playerblacklist", this.getPlayerBlacklist());
|
||||||
this.config.setProperty("worlds." + this.name + ".editwhitelist", this.getEditWhitelist());
|
|
||||||
this.config.setProperty("worlds." + this.name + ".editblacklist", this.getEditBlacklist());
|
|
||||||
this.config.setProperty("worlds." + this.name + ".worldblacklist", this.getWorldBlacklist());
|
this.config.setProperty("worlds." + this.name + ".worldblacklist", this.getWorldBlacklist());
|
||||||
this.config.save();
|
this.config.save();
|
||||||
}
|
}
|
||||||
@ -482,14 +474,6 @@ public class MVWorld {
|
|||||||
return this.masterList.get("playerblacklist");
|
return this.masterList.get("playerblacklist");
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<String> getEditWhitelist() {
|
|
||||||
return this.masterList.get("editwhitelist");
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<String> getEditBlacklist() {
|
|
||||||
return this.masterList.get("editblacklist");
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<String> getWorldBlacklist() {
|
public List<String> getWorldBlacklist() {
|
||||||
return this.masterList.get("worldblacklist");
|
return this.masterList.get("worldblacklist");
|
||||||
}
|
}
|
||||||
@ -552,7 +536,7 @@ public class MVWorld {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getRespawnToWorld() {
|
public String getRespawnToWorld() {
|
||||||
return respawnToWorld;
|
return this.respawnToWorld;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRespawnToWorld(String respawnToWorld) {
|
public void setRespawnToWorld(String respawnToWorld) {
|
||||||
|
@ -9,7 +9,7 @@ import com.onarandombox.MultiverseCore.MultiverseCore;
|
|||||||
import com.pneumaticraft.commandhandler.Command;
|
import com.pneumaticraft.commandhandler.Command;
|
||||||
|
|
||||||
enum AddProperties {
|
enum AddProperties {
|
||||||
blockblacklist, playerwhitelist, playerblacklist, editwhitelist, editblacklist, worldblacklist, animals, monsters
|
blockblacklist, playerwhitelist, playerblacklist, worldblacklist, animals, monsters
|
||||||
}
|
}
|
||||||
|
|
||||||
enum Action {
|
enum Action {
|
||||||
|
Loading…
Reference in New Issue
Block a user