EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 14:46:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixes #1063

Browse Source
This commit is contained in:
Jesse Boyd 2016-06-17 15:42:23 +10:00
parent 4319300b34
commit 081081b36e
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
View File

@ -8,10 +8,11 @@ import com.intellectualcrafters.plot.object.schematic.PlotItem;
import com.intellectualcrafters.plot.util.MathMan; import com.intellectualcrafters.plot.util.MathMan;
import com.intellectualcrafters.plot.util.StringComparison; import com.intellectualcrafters.plot.util.StringComparison;
import com.intellectualcrafters.plot.util.StringMan; import com.intellectualcrafters.plot.util.StringMan;
import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.UUIDHandler; import com.intellectualcrafters.plot.util.UUIDHandler;
import com.intellectualcrafters.plot.util.WorldUtil; import com.intellectualcrafters.plot.util.WorldUtil;
import com.plotsquared.bukkit.object.BukkitPlayer; import com.plotsquared.bukkit.object.BukkitPlayer;
import java.util.Arrays;
import java.util.List;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@ -32,9 +33,6 @@ import org.bukkit.material.Tree;
import org.bukkit.material.WoodenStep; import org.bukkit.material.WoodenStep;
import org.bukkit.material.Wool; import org.bukkit.material.Wool;
import java.util.Arrays;
import java.util.List;
public class BukkitUtil extends WorldUtil { public class BukkitUtil extends WorldUtil {
private static String lastString = null; private static String lastString = null;
@ -136,12 +134,6 @@ public class BukkitUtil extends WorldUtil {
sign.setLine(i, lines[i]); sign.setLine(i, lines[i]);
} }
sign.update(true); sign.update(true);
TaskManager.runTaskLater(new Runnable() {
@Override
public void run() {
sign.update(true);
}
}, 20);
} }
} }

1
Core/src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -171,6 +171,7 @@ public class PS {
if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) { if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) {
try { try {
if (this.IMP.initWorldEdit()) { if (this.IMP.initWorldEdit()) {
PS.debug("PlotSquared hooked into WorldEdit.");
this.worldedit = WorldEdit.getInstance(); this.worldedit = WorldEdit.getInstance();
WorldEdit.getInstance().getEventBus().register(new WESubscriber()); WorldEdit.getInstance().getEventBus().register(new WESubscriber());
new WE_Anywhere(); new WE_Anywhere();

15
Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
View File

@ -850,7 +850,7 @@ public class Plot {
if (!this.isMerged()) { if (!this.isMerged()) {
return false; return false;
} }
Set<Plot> plots = this.getConnectedPlots(); final Set<Plot> plots = this.getConnectedPlots();
ArrayList<PlotId> ids = new ArrayList<>(plots.size()); ArrayList<PlotId> ids = new ArrayList<>(plots.size());
for (Plot current : plots) { for (Plot current : plots) {
current.setHome(null); current.setHome(null);
@ -886,9 +886,16 @@ public class Plot {
for (Plot current : plots) { for (Plot current : plots) {
boolean[] merged = new boolean[]{false, false, false, false}; boolean[] merged = new boolean[]{false, false, false, false};
current.setMerged(merged); current.setMerged(merged);
if (createSign) { }
current.setSign(MainUtil.getName(current.owner)); if (createSign) {
} GlobalBlockQueue.IMP.addTask(new Runnable() {
@Override
public void run() {
for (Plot current : plots) {
current.setSign(MainUtil.getName(current.owner));
}
}
});
} }
if (createRoad) { if (createRoad) {
manager.finishPlotUnlink(this.area, ids); manager.finishPlotUnlink(this.area, ids);