Some fixes

Fixes #641
Closes #640 (need to also update Plot2Dynmap)
Fixes #637 (duplicate)
Fixes #636
Fixes #634

src/main/java/com/intellectualcrafters/plot/PS.java

@@ -1277,7 +1277,7 @@ public class PS {
                     e.printStackTrace();
                 }
                 if (((plotWorld.TYPE == 2) && !Settings.ENABLE_CLUSTERS) || !(plotManager instanceof SquarePlotManager)) {
-                    log("&c[ERROR] World '" + world + "' in settings.yml is not using PlotSquared generator! Please set the generator correctly or delete the world from the 'settings.yml'!");
+                    log("&c[ERROR] World '" + world + "' in settings.yml is not using PlotSquared generator! Please set the generator correctly or delete the world from the 'settings.yml'! (https://github.com/IntellectualSites/PlotSquared/wiki/Manual-generator-setting)");
                     return;
                 }
                 log(C.PREFIX.s() + "&aDetected world load for '" + world + "'");

src/main/java/com/intellectualcrafters/plot/commands/Merge.java

@@ -100,7 +100,7 @@ public class Merge extends SubCommand {
         final int size = plot.getConnectedPlots().size();
         final int maxSize = Permissions.hasPermissionRange(plr, "plots.merge", Settings.MAX_PLOTS); 
         if (size >= maxSize) {
-            MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.merge." + size);
+            MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.merge." + (size + 1));
             return false;
         }
         if (args.length == 0) {

src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java

@@ -316,8 +316,8 @@ public abstract class HybridUtils {
         final int tz = sz - 1;
         final int ty = get_ey(world, bx, tx, bz, tz, by);
         
-        final Set<RegionWrapper> sideroad = new HashSet<>(Arrays.asList(new RegionWrapper(sx, ex, sz, ez)));
-        final Set<RegionWrapper> intersection = new HashSet<>(Arrays.asList(new RegionWrapper(bx, tx, bz, tz)));
+        final Set<RegionWrapper> sideroad = new HashSet<>(Arrays.asList(new RegionWrapper(sx, ex, sy, ey, sz, ez)));
+        final Set<RegionWrapper> intersection = new HashSet<>(Arrays.asList(new RegionWrapper(bx, tx, by, ty, bz, tz)));
         
         final Location pos3 = new Location(world, bx, by, bz);
         final Location pos4 = new Location(world, tx, ty, tz);

src/main/java/com/intellectualcrafters/plot/util/MainUtil.java

@@ -2127,7 +2127,7 @@ public class MainUtil {
             if (!tmp.getMerged(2)) {
                 // invalid merge
                 PS.debug("Fixing invalid merge: " + plot);
-                tmp.settings.setMerged(2, true);
+                tmp.getSettings().setMerged(2, true);
                 DBFunc.setMerged(tmp, tmp.settings.getMerged());
             }
             queuecache.add(tmp);
@@ -2138,7 +2138,7 @@ public class MainUtil {
             if (!tmp.getMerged(3)) {
                 // invalid merge
                 PS.debug("Fixing invalid merge: " + plot);
-                tmp.settings.setMerged(3, true);
+                tmp.getSettings().setMerged(3, true);
                 DBFunc.setMerged(tmp, tmp.settings.getMerged());
             }
             queuecache.add(tmp);
@@ -2149,7 +2149,7 @@ public class MainUtil {
             if (!tmp.getMerged(0)) {
                 // invalid merge
                 PS.debug("Fixing invalid merge: " + plot);
-                tmp.settings.setMerged(0, true);
+                tmp.getSettings().setMerged(0, true);
                 DBFunc.setMerged(tmp, tmp.settings.getMerged());
             }
             queuecache.add(tmp);
@@ -2160,7 +2160,7 @@ public class MainUtil {
             if (!tmp.getMerged(1)) {
                 // invalid merge
                 PS.debug("Fixing invalid merge: " + plot);
-                tmp.settings.setMerged(1, true);
+                tmp.getSettings().setMerged(1, true);
                 DBFunc.setMerged(tmp, tmp.settings.getMerged());
             }
             queuecache.add(tmp);

src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java

@@ -1120,6 +1120,9 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
                         break;
                     }
                     default: {
+                        if (blockId > 197) {
+                            eventType = PlayerBlockEventType.INTERACT_BLOCK;
+                        }
                         break;
                     }
                 }