diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b6d2bf3f3..8f221dc8d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,12 +9,11 @@
-
-
-
-
-
-
+
+
+
+
+
@@ -48,33 +47,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -83,31 +60,77 @@
-
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -123,26 +146,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -160,12 +163,16 @@
-
-
+
+
+
+
+
+
@@ -487,7 +494,7 @@
-
+
1411382351159
@@ -521,11 +528,15 @@
1411389346708
1411389346708
-
+
+ 1411393484598
+ 1411393484598
+
+
-
+
@@ -579,7 +590,8 @@
-
+
+
@@ -613,7 +625,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -623,6 +648,7 @@
+
@@ -709,14 +735,6 @@
-
-
-
-
-
-
-
-
@@ -725,16 +743,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -751,14 +759,6 @@
-
-
-
-
-
-
-
-
@@ -767,14 +767,6 @@
-
-
-
-
-
-
-
-
@@ -783,10 +775,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -794,10 +850,37 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java b/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java
index 5d439dbee..0f27de48a 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java
@@ -129,8 +129,6 @@ public class PlayerFunctions {
return plots.get(id);
}
}
- else {
- }
return new Plot(id, null, Biome.FOREST, new ArrayList(), new ArrayList(), world.getName());
}
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java b/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
index bd9161ef0..fec8235d0 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
@@ -574,10 +574,6 @@ public class PlotMain extends JavaPlugin {
Settings.DB.DATABASE = storage.getString("mysql_database");
}
{
- Settings.Update.AUTO_UPDATE = config.getBoolean("auto_update");
-
-
-
//Web
Web.ENABLED = config.getBoolean("web.enabled");
Web.PORT = config.getInt("web.port");
@@ -645,7 +641,7 @@ public class PlotMain extends JavaPlugin {
}
else {
ChunkGenerator gen = world.getGenerator();
- if (gen==null || gen.toString().equals("PlotSquared")) {
+ if (gen==null || !gen.toString().equals("PlotSquared")) {
Logger.add(LogLevel.WARNING, "World '"+node+"' in settings.yml is not using PlotSquared generator");
}
}
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java b/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java
index 829a1f4af..5a5ae8bdd 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java
@@ -1,9 +1,9 @@
package com.intellectualcrafters.plot;
-import java.util.ArrayList;
-
import org.bukkit.Material;
+import java.util.ArrayList;
+
public class PlotWorld {
/**
* Road Height
@@ -159,5 +159,9 @@ public class PlotWorld {
* Blocks available in /p set
*/
public static ArrayList BLOCKS = new ArrayList();
+
+
+ public boolean SCHEMATIC_ON_CLAIM = false;
+ public String SCHEMATIC_FILE = "null";
}
diff --git a/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java b/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java
index 7f732a3e4..6ec532a51 100644
--- a/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java
+++ b/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java
@@ -55,6 +55,12 @@ public class Claim extends SubCommand{
if(teleport) {
PlotMain.teleportPlayer(player, player.getLocation(), plot);
}
+ PlotWorld world = PlotMain.getWorldSettings(plot.getWorld());
+ if(world.SCHEMATIC_ON_CLAIM) {
+ SchematicHandler handler = new SchematicHandler();
+ SchematicHandler.Schematic schematic = handler.getSchematic(world.SCHEMATIC_FILE);
+ handler.paste(player.getLocation(), schematic, plot);
+ }
}
return event.isCancelled();
}