diff --git a/pom.xml b/pom.xml
index da55846ca..6a30592d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
UTF-8
PlotSquared
- 3.2.25
+ 3.2.26
PlotSquared
jar
diff --git a/src/main/java/com/intellectualcrafters/plot/PS.java b/src/main/java/com/intellectualcrafters/plot/PS.java
index c04c2aa13..726bd5fe7 100644
--- a/src/main/java/com/intellectualcrafters/plot/PS.java
+++ b/src/main/java/com/intellectualcrafters/plot/PS.java
@@ -393,10 +393,8 @@ public class PS {
map = new ConcurrentHashMap();
map.put(plot.id, plot);
plots.put(plot.world, map);
- System.out.println("UPDATING PLOT 2!: " + plot);
return true;
} else {
- System.out.println("UPDATING PLOT!: " + plot);
return map.put(plot.id, plot) == null;
}
}
diff --git a/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
index 5ac0af137..e9ce62fb8 100644
--- a/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
@@ -640,7 +640,6 @@ public class SQLManager implements AbstractDB {
if (last == -1) {
last = subList.size();
statement = mod.getCreateMySQL(subList.size());
- System.out.print(statement);
preparedStmt = connection.prepareStatement(statement);
}
if ((subList.size() != last) || (((count % 5000) == 0) && (count > 0))) {
diff --git a/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java b/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
index 40abbbe72..7671b5cd6 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
@@ -1482,11 +1482,9 @@ public class MainUtil {
* Create a plot and notify the world border and plot merger
*/
public static Plot createPlot(final UUID uuid, final Plot plot) {
- System.out.println("CLAIMING PLOT 1");
if (uuid == null) {
return null;
}
- System.out.println("CLAIMING PLOT 2");
Plot existing = PS.get().getPlot(plot.world, plot.id);
if (existing != null) {
return existing;
diff --git a/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java b/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
index bdb1bc2b3..4501e5a16 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
@@ -1,30 +1,5 @@
package com.intellectualcrafters.plot.util;
-import com.google.common.collect.Lists;
-import com.intellectualcrafters.jnbt.ByteArrayTag;
-import com.intellectualcrafters.jnbt.CompoundTag;
-import com.intellectualcrafters.jnbt.IntTag;
-import com.intellectualcrafters.jnbt.ListTag;
-import com.intellectualcrafters.jnbt.NBTInputStream;
-import com.intellectualcrafters.jnbt.NBTOutputStream;
-import com.intellectualcrafters.jnbt.ShortTag;
-import com.intellectualcrafters.jnbt.StringTag;
-import com.intellectualcrafters.jnbt.Tag;
-import com.intellectualcrafters.json.JSONArray;
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.generator.ClassicPlotWorld;
-import com.intellectualcrafters.plot.object.ChunkLoc;
-import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.object.RegionWrapper;
-import com.intellectualcrafters.plot.object.RunnableVal;
-import com.intellectualcrafters.plot.object.schematic.PlotItem;
-import com.plotsquared.object.schematic.StateWrapper;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -54,6 +29,31 @@ import java.util.UUID;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
+import com.google.common.collect.Lists;
+import com.intellectualcrafters.jnbt.ByteArrayTag;
+import com.intellectualcrafters.jnbt.CompoundTag;
+import com.intellectualcrafters.jnbt.IntTag;
+import com.intellectualcrafters.jnbt.ListTag;
+import com.intellectualcrafters.jnbt.NBTInputStream;
+import com.intellectualcrafters.jnbt.NBTOutputStream;
+import com.intellectualcrafters.jnbt.ShortTag;
+import com.intellectualcrafters.jnbt.StringTag;
+import com.intellectualcrafters.jnbt.Tag;
+import com.intellectualcrafters.json.JSONArray;
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.generator.ClassicPlotWorld;
+import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.object.RegionWrapper;
+import com.intellectualcrafters.plot.object.RunnableVal;
+import com.intellectualcrafters.plot.object.schematic.PlotItem;
+import com.plotsquared.object.schematic.StateWrapper;
+
public abstract class SchematicHandler {
public static SchematicHandler manager;
@@ -262,7 +262,6 @@ public abstract class SchematicHandler {
case 47:
case 48:
case 49:
- case 50:
case 51:
case 55:
case 56:
@@ -276,8 +275,6 @@ public abstract class SchematicHandler {
case 11:
case 73:
case 74:
- case 75:
- case 76:
case 78:
case 79:
case 80:
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
index fe955e725..65ec37700 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -451,7 +451,12 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
MainUtil.sendMessage(pp, "&6An update for PlotSquared is available: &7/plot update");
}
if (Settings.TELEPORT_ON_LOGIN && plot != null) {
- MainUtil.teleportPlayer(pp, pp.getLocation(), plot);
+ TaskManager.runTask(new Runnable() {
+ @Override
+ public void run() {
+ MainUtil.teleportPlayer(pp, pp.getLocation(), plot);
+ }
+ });
MainUtil.sendMessage(pp, C.TELEPORTED_TO_ROAD);
}
}
@@ -467,6 +472,9 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
final Player player = event.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(player);
+ // Cancel teleport
+ TaskManager.TELEPORT_QUEUE.remove(pp.getName());
+
// Set last location
Location loc = BukkitUtil.getLocation(to);
pp.setMeta("location", loc);
@@ -524,6 +532,9 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
final Player player = event.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(player);
+ // Cancel teleport
+ TaskManager.TELEPORT_QUEUE.remove(pp.getName());
+
// Set last location
Location loc = BukkitUtil.getLocation(to);
pp.setMeta("location", loc);
diff --git a/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java b/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java
index d711f5a4a..99b226c78 100644
--- a/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java
+++ b/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java
@@ -58,7 +58,6 @@ public class BukkitLazyBlock extends LazyBlock {
case 47:
case 48:
case 49:
- case 50:
case 51:
case 52:
case 54:
@@ -76,8 +75,6 @@ public class BukkitLazyBlock extends LazyBlock {
case 11:
case 73:
case 74:
- case 75:
- case 76:
case 78:
case 79:
case 80:
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java b/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java
index 2abab4914..933e29613 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java
@@ -23,7 +23,6 @@ package com.plotsquared.bukkit.util;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -44,13 +43,10 @@ import com.intellectualcrafters.jnbt.StringTag;
import com.intellectualcrafters.jnbt.Tag;
import com.intellectualcrafters.plot.object.ChunkLoc;
import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
import com.intellectualcrafters.plot.object.RegionWrapper;
import com.intellectualcrafters.plot.object.RunnableVal;
import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.SchematicHandler;
-import com.intellectualcrafters.plot.util.StringMan;
import com.intellectualcrafters.plot.util.TaskManager;
import com.plotsquared.object.schematic.StateWrapper;
@@ -200,7 +196,6 @@ public class BukkitSchematicHandler extends SchematicHandler {
case 47:
case 48:
case 49:
- case 50:
case 51:
case 55:
case 56:
@@ -214,8 +209,6 @@ public class BukkitSchematicHandler extends SchematicHandler {
case 11:
case 73:
case 74:
- case 75:
- case 76:
case 78:
case 79:
case 80:
diff --git a/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java b/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
index 151e6ca6b..b1326f064 100644
--- a/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
+++ b/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
@@ -149,7 +149,6 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
case 47:
case 48:
case 49:
- case 50:
case 51:
case 52:
case 54:
@@ -167,8 +166,6 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
case 11:
case 73:
case 74:
- case 75:
- case 76:
case 78:
case 79:
case 80:
diff --git a/src/main/java/com/plotsquared/sponge/SpongeSchematicHandler.java b/src/main/java/com/plotsquared/sponge/SpongeSchematicHandler.java
index e54e2fa38..56f6a6e2b 100644
--- a/src/main/java/com/plotsquared/sponge/SpongeSchematicHandler.java
+++ b/src/main/java/com/plotsquared/sponge/SpongeSchematicHandler.java
@@ -173,7 +173,6 @@ public class SpongeSchematicHandler extends SchematicHandler {
case 47:
case 48:
case 49:
- case 50:
case 51:
case 55:
case 56:
@@ -187,8 +186,6 @@ public class SpongeSchematicHandler extends SchematicHandler {
case 11:
case 73:
case 74:
- case 75:
- case 76:
case 78:
case 79:
case 80:
diff --git a/target/PlotSquared-Bukkit.jar b/target/PlotSquared-Bukkit.jar
index b0b5b6844..38aa60357 100644
Binary files a/target/PlotSquared-Bukkit.jar and b/target/PlotSquared-Bukkit.jar differ