EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-07-17 12:54:43 +02:00
Code Issues Projects Releases Wiki Activity

Fixes #524

Browse Source
This commit is contained in:
boy0001
2015-08-09 19:58:29 +10:00
parent 051449157a
commit e28c68ee74
14 changed files with 113 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/intellectualcrafters/plot/commands/Info.java
View File

@ -25,6 +25,7 @@ import java.util.Collection;
import java.util.UUID;
import java.util.regex.Matcher;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc;
@ -36,6 +37,7 @@ import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.PlotInventory;
import com.intellectualcrafters.plot.object.PlotItemStack;
import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.PlotWorld;
import com.intellectualcrafters.plot.util.BlockManager;
import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.StringMan;

7
src/main/java/com/intellectualcrafters/plot/commands/Setup.java
View File

@ -25,6 +25,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map.Entry;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.ConfigurationNode;
import com.intellectualcrafters.plot.config.Settings;
@ -220,7 +221,11 @@ public class Setup extends SubCommand {
return false;
}
if (BlockManager.manager.isWorld(args[0])) {
MainUtil.sendMessage(plr, "&cThat world name is already taken!");
if (PS.get().isPlotWorld(args[0])) {
MainUtil.sendMessage(plr, "&cThat world name is already taken!");
return false;
}
MainUtil.sendMessage(plr, "&cThe world you specified already exists. After restarting, new terrain will use PlotSquared, however you may need to reset the world for it to generate correctly!");
}
object.world = args[0];
SetupUtils.setupMap.remove(name);