TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-10 06:23:14 +00:00
Code Issues Projects Releases Wiki Activity

yay, conflicts

Browse source
This commit is contained in:
boy0001 2015-02-19 14:38:49 +11:00
parent 4a314144c6
commit f154754e1b
17 changed files with 46 additions and 625 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java
View file

@ -30,11 +30,7 @@ import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.generator.HybridPlotManager;
import com.intellectualcrafters.plot.generator.HybridPlotWorld;
<<<<<<< Updated upstream
import com.intellectualcrafters.plot.util.AbstractSetBlock;
=======
import com.intellectualcrafters.plot.util.SetBlockManager;
>>>>>>> Stashed changes
import com.intellectualcrafters.plot.util.PlayerFunctions;
public class DebugRoadRegen extends SubCommand {
@ -53,11 +49,7 @@ public class DebugRoadRegen extends SubCommand {
Chunk chunk = player.getLocation().getChunk();
boolean result = manager.regenerateRoad(chunk);
if (result) {
<<<<<<< Updated upstream
AbstractSetBlock.setBlockManager.update(Arrays.asList(new Chunk[] {chunk}));
=======
SetBlockManager.setBlockManager.update(Arrays.asList(new Chunk[] {chunk}));
>>>>>>> Stashed changes
}
PlayerFunctions.sendMessage(player, "&6Regenerating chunk: "+chunk.getX() + "," + chunk.getZ() + "\n&6 - Result: " + (result == true ? "&aSuccess" : "&cFailed"));
return true;