From 8fb5be5b47cf9ddee2b1ae418ce9eab8c71a75df Mon Sep 17 00:00:00 2001 From: boy0001 Date: Wed, 15 Jul 2015 04:53:06 +1000 Subject: [PATCH] I'm a nub --- PlotSquared/pom.xml | 2 +- .../plot/database/plotme/LikePlotMeConverter.java | 2 +- .../com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml index c7afedb20..eb6c71e9a 100644 --- a/PlotSquared/pom.xml +++ b/PlotSquared/pom.xml @@ -8,7 +8,7 @@ UTF-8 PlotSquared - 2.12.7 + 2.12.8 PlotSquared jar diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java index 59d8d60fe..01cc063f3 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/plotme/LikePlotMeConverter.java @@ -150,7 +150,7 @@ public class LikePlotMeConverter { sendMessage(" - " + dbPrefix + "Plots"); final Set worlds = getPlotMeWorlds(plotConfig); - if (!Settings.CONVERT_PLOTME) { + if (Settings.CONVERT_PLOTME) { sendMessage("Updating bukkit.yml"); updateWorldYml(plugin, "bukkit.yml"); updateWorldYml(plugin, "plugins/Multiverse-Core/worlds.yml"); diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java index 904184a48..089678b76 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/BukkitUtil.java @@ -23,6 +23,7 @@ import org.bukkit.material.MaterialData; import org.bukkit.material.Sandstone; import org.bukkit.material.Step; import org.bukkit.material.Tree; +import org.bukkit.material.WoodenStep; import org.bukkit.material.Wool; import com.intellectualcrafters.plot.object.BukkitPlayer; @@ -326,8 +327,7 @@ public class BukkitUtil extends BlockManager { Material material = Material.getMaterial(block.id); if (material.isBlock() && material.isSolid() && !material.hasGravity()) { Class data = material.getData(); - if ((data.equals(MaterialData.class) && !material.isTransparent() && material.isOccluding()) || data.equals(Tree.class) || data.equals(Sandstone.class) || data.equals(Wool.class) || data.equals(Step.class)) { - System.out.print((data.equals(MaterialData.class) && !material.isTransparent() && material.isOccluding()) + " | " + data.getCanonicalName()); + if ((data.equals(MaterialData.class) && !material.isTransparent() && material.isOccluding()) || data.equals(Tree.class) || data.equals(Sandstone.class) || data.equals(Wool.class) || data.equals(Step.class) || data.equals(WoodenStep.class)) { switch (material) { case NOTE_BLOCK: case MOB_SPAWNER: {