1
0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-04 22:54:44 +02:00

Cleanup formatting.

This commit is contained in:
Grant
2012-12-24 16:56:25 -05:00
parent 6b3bde585d
commit 36d5344ded
67 changed files with 894 additions and 849 deletions

@ -91,7 +91,7 @@ public class BleedTimer implements Runnable {
if (bleedList.containsKey(entity)) {
Combat.dealDamage(entity, bleedList.get(entity) * 2);
bleedList.remove(entity);
}
}
}
/**

@ -221,9 +221,9 @@ public class SQLConversionTask implements Runnable {
+ playerName + "',"
+ System.currentTimeMillis() / 1000 + ")");
id = database.getInt("SELECT id FROM "
+ tablePrefix
+ "users WHERE user = '"
+ playerName + "'");
+ tablePrefix
+ "users WHERE user = '"
+ playerName + "'");
database.write("INSERT INTO "
+ tablePrefix
+ "skills (user_id) VALUES (" + id + ")");

@ -20,8 +20,8 @@ public class BlockStoreConversionMain implements Runnable {
this.taskID = -1;
this.world = world;
this.scheduler = mcMMO.p.getServer().getScheduler();
this.dataDir = new File(this.world.getWorldFolder(), "mcmmo_data");
this.converters = new BlockStoreConversionXDirectory[HiddenConfig.getInstance().getConversionRate()];
this.dataDir = new File(this.world.getWorldFolder(), "mcmmo_data");
this.converters = new BlockStoreConversionXDirectory[HiddenConfig.getInstance().getConversionRate()];
}
public void start() {
@ -32,6 +32,7 @@ public class BlockStoreConversionMain implements Runnable {
return;
}
@Override
public void run() {
if(!this.dataDir.exists()) {
softStop();

@ -33,6 +33,7 @@ public class BlockStoreConversionXDirectory implements Runnable {
return;
}
@Override
public void run() {
if(!this.dataDir.exists()) {
stop();
@ -51,7 +52,7 @@ public class BlockStoreConversionXDirectory implements Runnable {
return;
}
this.zDirs = this.dataDir.listFiles();
this.zDirs = this.dataDir.listFiles();
for (this.i = 0; (this.i < HiddenConfig.getInstance().getConversionRate()) && (this.i < this.zDirs.length); this.i++) {
if(this.converters[this.i] == null)
@ -70,10 +71,10 @@ public class BlockStoreConversionXDirectory implements Runnable {
this.scheduler.cancelTask(this.taskID);
this.taskID = -1;
this.dataDir = null;
this.zDirs = null;
this.world = null;
this.scheduler = null;
this.converters = null;
this.dataDir = null;
this.zDirs = null;
this.world = null;
this.scheduler = null;
this.converters = null;
}
}

@ -47,6 +47,7 @@ public class BlockStoreConversionZDirectory implements Runnable {
return;
}
@Override
public void run() {
if(!this.dataDir.exists()) {
stop();
@ -84,7 +85,7 @@ public class BlockStoreConversionZDirectory implements Runnable {
for(this.y = 0; this.y < (this.world.getMaxHeight() / 64); this.y++) {
this.chunkletName = this.world.getName() + "," + this.cx + "," + this.cz + "," + this.y;
this.tempChunklet = this.manager.store.get(this.chunkletName);
this.tempChunklet = this.manager.store.get(this.chunkletName);
if(this.tempChunklet instanceof PrimitiveChunkletStore)
this.primitiveChunklet = (PrimitiveChunkletStore) this.tempChunklet;
else if(this.tempChunklet instanceof PrimitiveExChunkletStore)
@ -119,7 +120,7 @@ public class BlockStoreConversionZDirectory implements Runnable {
}
this.newManager.setTrue(this.cx * 16, 0, this.cz * 16, this.world);
this.newManager.setFalse(this.cx * 16, 0, this.cz * 16, this.world);
this.newManager.setFalse(this.cx * 16, 0, this.cz * 16, this.world);
this.currentChunk = (PrimitiveChunkStore) this.newManager.store.get(this.chunkName);
for(this.x = 0; this.x < 16; this.x++) {