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

StringMan instead of StringUtils

Browse Source
This commit is contained in:
boy0001
2015-07-27 04:38:08 +10:00
parent 042a295a55
commit 393a5bffd5
24 changed files with 277 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/plotsquared/bukkit/util/bukkit/BukkitChunkManager.java
View File

@ -20,7 +20,6 @@ import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.SetBlockQueue.ChunkWrapper;
import com.intellectualcrafters.plot.util.TaskManager;
import org.apache.commons.lang.mutable.MutableInt;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.DyeColor;
@ -64,6 +63,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
public class BukkitChunkManager extends ChunkManager {
@Override
@ -193,7 +193,7 @@ public class BukkitChunkManager extends ChunkManager {
*/
@Override
public boolean copyRegion(final Location pos1, final Location pos2, final Location newPos, final Runnable whenDone) {
TaskManager.index.increment();
TaskManager.index.incrementAndGet();
final int relX = newPos.getX() - pos1.getX();
final int relZ = newPos.getZ() - pos1.getZ();
@ -224,7 +224,7 @@ public class BukkitChunkManager extends ChunkManager {
}
}
final Plugin plugin = BukkitMain.THIS;
final Integer currentIndex = TaskManager.index.toInteger();
final Integer currentIndex = TaskManager.index.get();
final int loadTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override
public void run() {
@ -236,7 +236,7 @@ public class BukkitChunkManager extends ChunkManager {
TaskManager.runTask(new Runnable() {
@Override
public void run() {
TaskManager.index.increment();
TaskManager.index.incrementAndGet();
// Copy entities
initMaps();
for (int x = c1x; x <= c2x; x++) {
@ -247,8 +247,8 @@ public class BukkitChunkManager extends ChunkManager {
}
}
// Copy blocks
final MutableInt mx = new MutableInt(sx);
final Integer currentIndex = TaskManager.index.toInteger();
final AtomicInteger mx = new AtomicInteger(sx);
final Integer currentIndex = TaskManager.index.get();
final int maxY = oldWorld.getMaxHeight();
final Integer task = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override
@ -265,7 +265,7 @@ public class BukkitChunkManager extends ChunkManager {
BukkitSetBlockManager.setBlockManager.set(newWorld, xv + relX, y, z + relZ, id, data);
}
}
mx.increment();
mx.incrementAndGet();
if (xv == ex) { // done!
for (int x = c1x; x <= c2x; x++) {
for (int z = c1z; z <= c2z; z++) {

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

@ -4,7 +4,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Material;
@ -35,6 +34,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.object.schematic.PlotItem;
import com.intellectualcrafters.plot.util.BlockManager;
import com.intellectualcrafters.plot.util.ChunkManager;
import com.intellectualcrafters.plot.util.MathMan;
import com.intellectualcrafters.plot.util.StringComparison;
public class BukkitUtil extends BlockManager {
@ -380,7 +380,7 @@ public class BukkitUtil extends BlockManager {
else {
data = 0;
}
if (StringUtils.isNumeric(split[0])) {
if (MathMan.isInteger(split[0])) {
id = Short.parseShort(split[0]);
match = 0;
}