EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 10:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Various minor

Browse Source 
VehicleMoveEvent
- Move KillRoadVehicles code there
- Fix for pre-1.12
Fix auto merge being disabled
This commit is contained in:
Jesse Boyd
2017-11-09 10:15:16 +11:00
parent 515aca5f06
commit 37f1da0715
4 changed files with 172 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
View File

@ -224,6 +224,9 @@ public class Auto extends SubCommand {
MainUtil.sendMessage(player, C.NO_FREE_PLOTS);
} else {
plot.claim(player, true, schem, false);
if (area.AUTO_MERGE) {
plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
}
}
}
});

3
Core/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
View File

@ -94,6 +94,9 @@ public class Claim extends SubCommand {
@Override
public void run(Object value) {
plot.claim(player, true, finalSchematic, false);
if (area.AUTO_MERGE) {
plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
}
}
});
}

3
Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java
View File

@ -319,8 +319,9 @@ public class Settings extends Config {
public static boolean PLOT_EXPIRY = false;
@Comment("Processes chunks (trimming, or entity/tile limits) ")
public static boolean CHUNK_PROCESSOR = false;
@Comment("Kill mobs or vehicles on roads")
@Comment("Kill mobs on roads")
public static boolean KILL_ROAD_MOBS = false;
@Comment("Kill vehicles on roads")
public static boolean KILL_ROAD_VEHICLES = false;
@Comment("Notify a player of any missed comments upon plot entry")
public static boolean COMMENT_NOTIFIER = false;