diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 49f56394c..0760df20d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,7 +10,9 @@
-
+
+
+
@@ -37,49 +39,144 @@
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -88,7 +185,7 @@
-
+
@@ -98,86 +195,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -186,8 +205,8 @@
-
-
+
+
@@ -230,7 +249,6 @@
-
@@ -247,16 +265,17 @@
-
-
-
+
+
+
+
@@ -297,7 +316,6 @@
-
@@ -404,36 +422,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -459,6 +447,7 @@
+
@@ -472,7 +461,7 @@
-
+
@@ -530,48 +519,16 @@
- $PROJECT_DIR$/.classpath
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/C.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java
+ $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotGenerator.java
$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
+ $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java
$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotManager.java
$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Auto.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Camera.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Clear.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Clipboard.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Command.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/CommandPermission.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Copy.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Debug.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Delete.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Denied.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Help.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Helpers.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Home.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Info.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Inventory.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Kick.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/MainCommand.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Merge.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Paste.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Rate.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Reload.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/SetOwner.java
+ $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Purge.java
$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Setup.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/SubCommand.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/TP.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Trusted.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Unlink.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Visit.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/list.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/plugin.java
$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java
+ $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/PlotMeConverter.java
$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotManager.java
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/listeners/PlayerEvents.java
@@ -579,7 +536,6 @@
- $PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Purge.java
@@ -831,7 +787,9 @@
-
+
+
+
1411382351159
@@ -1033,11 +991,15 @@
1413710090266
1413710090266
-
+
+ 1413710260915
+ 1413710260915
+
+
-
+
@@ -1060,7 +1022,7 @@
-
+
@@ -1075,18 +1037,18 @@
-
-
+
+
@@ -1135,7 +1097,6 @@
-
@@ -1160,7 +1121,8 @@
-
+
+
@@ -1172,13 +1134,6 @@
-
-
-
-
-
-
-
@@ -1204,7 +1159,6 @@
-
@@ -1212,7 +1166,6 @@
-
@@ -1220,7 +1173,6 @@
-
@@ -1284,7 +1236,6 @@
-
@@ -1299,7 +1250,6 @@
-
@@ -1307,15 +1257,6 @@
-
-
-
-
-
-
-
-
-
@@ -1323,7 +1264,6 @@
-
@@ -1331,7 +1271,6 @@
-
@@ -1339,7 +1278,6 @@
-
@@ -1347,11 +1285,6 @@
-
-
-
-
-
@@ -1359,7 +1292,6 @@
-
@@ -1367,7 +1299,6 @@
-
@@ -1375,9 +1306,6 @@
-
-
-
@@ -1385,7 +1313,6 @@
-
@@ -1393,7 +1320,6 @@
-
@@ -1401,7 +1327,6 @@
-
@@ -1409,22 +1334,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1432,9 +1341,6 @@
-
-
-
@@ -1442,13 +1348,6 @@
-
-
-
-
-
-
-
@@ -1456,7 +1355,6 @@
-
@@ -1464,7 +1362,6 @@
-
@@ -1480,7 +1377,6 @@
-
@@ -1488,10 +1384,6 @@
-
-
-
-
@@ -1499,15 +1391,6 @@
-
-
-
-
-
-
-
-
-
@@ -1515,79 +1398,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1599,28 +1416,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1629,23 +1424,157 @@
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/C.java b/PlotSquared/src/com/intellectualcrafters/plot/C.java
index 21ae5a39a..22f97a7b2 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/C.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/C.java
@@ -339,6 +339,9 @@ public enum C {
}
}
+ public static class Potato {
+
+ }
/**
* Get the default string
*
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java b/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
index 192f0c20c..0c1119e47 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java
@@ -9,9 +9,7 @@
package com.intellectualcrafters.plot;
import com.intellectualcrafters.plot.database.DBFunc;
-
import net.milkbowl.vault.economy.Economy;
-
import org.bukkit.*;
import org.bukkit.block.Biome;
import org.bukkit.block.Block;
@@ -19,7 +17,6 @@ import org.bukkit.block.BlockState;
import org.bukkit.block.Sign;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
import java.io.File;
import java.util.ArrayList;
@@ -701,6 +698,7 @@ public class PlotHelper {
refreshPlotChunks(world, plot);
// SetBlockFast.update(requester);
}
+
return;
}
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java b/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
index 2b16b18ca..9c6b876e9 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
@@ -53,6 +53,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
/**
* @awesome @author Citymonstret, Empire92 PlotMain class.
@@ -456,8 +457,8 @@ public class PlotMain extends JavaPlugin {
if (lastPlayed == 0) {
continue;
}
- int days = (int) (lastPlayed / (1000 * 60 * 60 * 24));
- if (days >= Settings.AUTO_CLEAR_DAYS) {
+ long compared = System.currentTimeMillis() - lastPlayed;
+ if (TimeUnit.MILLISECONDS.toDays(compared) >= Settings.AUTO_CLEAR_DAYS) {
PlotDeleteEvent event = new PlotDeleteEvent(world, plot.id);
Bukkit.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -1282,21 +1283,16 @@ public class PlotMain extends JavaPlugin {
@Override
public String parseValue(String value) {
switch (value) {
- case "true":
- return "true";
- case "yes":
- return "true";
- case "1":
- return "true";
- case "false":
- return "false";
- case "no":
- return "false";
- case "0":
- return "false";
- default:
- return null;
-
+ case "true":
+ case "1":
+ case "yes":
+ return "true";
+ case "false":
+ case "off":
+ case "0":
+ return "false";
+ default:
+ return null;
}
}
@@ -1313,26 +1309,20 @@ public class PlotMain extends JavaPlugin {
@Override
public String parseValue(String value) {
switch (value) {
- case "creative":
- return "creative";
- case "survival":
- return "survival";
- case "adventure":
- return "adventure";
- case "c":
- return "creative";
- case "s":
- return "survival";
- case "a":
- return "adventure";
- case "1":
- return "creative";
- case "0":
- return "survival";
- case "2":
- return "adventure";
- default:
- return null;
+ case "creative":
+ case "c":
+ case "1":
+ return "creative";
+ case "survival":
+ case "s":
+ case "0":
+ return "survival";
+ case "adventure":
+ case "a":
+ case "2":
+ return "adventure";
+ default:
+ return null;
}
}
@@ -1364,16 +1354,12 @@ public class PlotMain extends JavaPlugin {
public String parseValue(String value) {
switch (value) {
case "rain":
- return "rain";
case "storm":
- return "rain";
case "on":
return "rain";
case "clear":
- return "clear";
- case "sun":
- return "clear";
case "off":
+ case "sun":
return "clear";
default:
return null;