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

stuff

Browse Source
This commit is contained in:
boy0001
2015-08-04 22:21:12 +10:00
parent 76ca8a7376
commit 8e240b5274
37 changed files with 364 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java
View File

@ -126,7 +126,7 @@ public abstract class ChunkManager {
*/
public abstract boolean regenerateRegion(final Location pos1, final Location pos2, final Runnable whenDone);
public abstract void clearAllEntities(final Plot plot);
public abstract void clearAllEntities(final Location pos1, final Location pos2);
public abstract void swap(String world, PlotId id, PlotId plotid);

1
src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java
View File

@ -3,7 +3,6 @@ package com.intellectualcrafters.plot.util;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map.Entry;
import java.util.Random;
import org.bukkit.Bukkit;

51
src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -24,12 +24,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Configuration;
import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.object.BlockLoc;
@ -289,7 +289,7 @@ public class MainUtil {
MainUtil.sendMessage(player, C.REMOVED_BALANCE, cost + "");
}
}
return MainUtil.mergePlots(world, plotIds, true);
return MainUtil.mergePlots(world, plotIds, true, true);
}
public static boolean unlinkPlot(final Plot plot) {
@ -620,10 +620,13 @@ public class MainUtil {
*
* @return boolean (success)
*/
public static boolean mergePlots(final String world, final ArrayList<PlotId> plotIds, final boolean removeRoads) {
public static boolean mergePlots(final String world, final ArrayList<PlotId> plotIds, final boolean removeRoads, final boolean updateDatabase) {
if (plotIds.size() < 2) {
return false;
}
// merged plots set db before finished merging
final PlotId pos1 = plotIds.get(0);
final PlotId pos2 = plotIds.get(plotIds.size() - 1);
final PlotManager manager = PS.get().getPlotManager(world);
@ -676,14 +679,16 @@ public class MainUtil {
}
}
}
for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) {
final PlotId id = new PlotId(x, y);
final Plot plot = PS.get().getPlots(world).get(id);
DBFunc.setMerged(plot, plot.getSettings().getMerged());
manager.finishPlotMerge(plotworld, plotIds);
if (updateDatabase) {
for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) {
final PlotId id = new PlotId(x, y);
final Plot plot = PS.get().getPlots(world).get(id);
DBFunc.setMerged(plot, plot.getSettings().getMerged());
}
}
}
manager.finishPlotMerge(plotworld, plotIds);
return true;
}
@ -744,7 +749,7 @@ public class MainUtil {
/**
* Merges 2 plots Removes the road inbetween <br> - Assumes the first plot parameter is lower <br> - Assumes neither
* are a Mega-plot <br> - Assumes plots are directly next to each other <br> - Saves to DB
* are a Mega-plot <br> - Assumes plots are directly next to each other <br> - Does not save to DB
*
* @param world
* @param lesserPlot
@ -840,6 +845,7 @@ public class MainUtil {
ArrayList<PlotId> plots;
boolean merge = true;
int count = 0;
ArrayList<PlotId> toUpdate = new ArrayList<>();
while (merge) {
if (count > 16) {
break;
@ -849,38 +855,46 @@ public class MainUtil {
final PlotId top = getTopPlot(plot).id;
plots = getPlotSelectionIds(new PlotId(bot.x, bot.y - 1), new PlotId(top.x, top.y));
if (ownsPlots(plot.world, plots, uuid, 0)) {
final boolean result = mergePlots(plot.world, plots, removeRoads);
final boolean result = mergePlots(plot.world, plots, removeRoads, false);
if (result) {
toUpdate.addAll(plots);
merge = true;
continue;
}
}
plots = getPlotSelectionIds(new PlotId(bot.x, bot.y), new PlotId(top.x + 1, top.y));
if (ownsPlots(plot.world, plots, uuid, 1)) {
final boolean result = mergePlots(plot.world, plots, removeRoads);
final boolean result = mergePlots(plot.world, plots, removeRoads, false);
if (result) {
toUpdate.addAll(plots);
merge = true;
continue;
}
}
plots = getPlotSelectionIds(new PlotId(bot.x, bot.y), new PlotId(top.x, top.y + 1));
if (ownsPlots(plot.world, plots, uuid, 2)) {
final boolean result = mergePlots(plot.world, plots, removeRoads);
final boolean result = mergePlots(plot.world, plots, removeRoads, false);
if (result) {
toUpdate.addAll(plots);
merge = true;
continue;
}
}
plots = getPlotSelectionIds(new PlotId(bot.x - 1, bot.y), new PlotId(top.x, top.y));
if (ownsPlots(plot.world, plots, uuid, 3)) {
final boolean result = mergePlots(plot.world, plots, removeRoads);
final boolean result = mergePlots(plot.world, plots, removeRoads, false);
if (result) {
toUpdate.addAll(plots);
merge = true;
continue;
}
}
merge = false;
}
for (PlotId id : toUpdate) {
Plot update = getPlot(plot.world, id);
DBFunc.setMerged(plot, plot.getSettings().getMerged());
}
}
private static boolean ownsPlots(final String world, final ArrayList<PlotId> plots, final UUID uuid, final int dir) {
@ -944,7 +958,7 @@ public class MainUtil {
*/
public static Plot createPlotAbs(final UUID uuid, final Plot plot) {
final String w = plot.world;
HashMap<PlotId, Plot> plots = PS.get().getPlots(plot.world);
Map<PlotId, Plot> plots = PS.get().getPlots(plot.world);
Plot p = plots.get(plot.id);
if (p != null) {
return p;
@ -985,9 +999,12 @@ public class MainUtil {
if (runners.containsKey(plot)) {
return false;
}
ChunkManager.manager.clearAllEntities(plot);
long start = System.currentTimeMillis();
ChunkManager.manager.clearAllEntities(plot.getBottom().add(1, 0, 1), plot.getTop());
if (isDelete) {
removeSign(plot);
}
clear(plot, isDelete, whenDone);
removeSign(plot);
return true;
}

7
src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java
View File

@ -67,6 +67,7 @@ public class SetBlockQueue {
TaskManager.runTask(runnable);
}
}
lastInt = -1;
lastBlock = null;
runnables = null;
blocks = new HashMap<>();
@ -75,8 +76,8 @@ public class SetBlockQueue {
return;
}
long newLast = System.currentTimeMillis();
last = Math.max(newLast - 100, last);
while (blocks.size() > 0 && (System.currentTimeMillis() - last < 100 + allocate)) {
last = Math.max(newLast - 50, last);
while (blocks.size() > 0 && (System.currentTimeMillis() - last < 50 + allocate)) {
if (locked) {
return;
}
@ -129,7 +130,7 @@ public class SetBlockQueue {
}
}
}
}, 2);
}, 1);
TaskManager.tasks.put(current, task);
running = true;
}