diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-24 23:22:32 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-25 00:51:36 -0500 |
commit | 5f089137ee63505b85ee7ddf0e75cb797c835d41 (patch) | |
tree | 1a73488a61ae3bec6ae237b7c1d83652f211cdac /src/main/java/net/minecraft/server/ChunkProviderServer.java | |
parent | 7c40a073d8b173dde3f7c13985b5b587e6158894 (diff) | |
download | craftbukkit-5f089137ee63505b85ee7ddf0e75cb797c835d41.tar craftbukkit-5f089137ee63505b85ee7ddf0e75cb797c835d41.tar.gz craftbukkit-5f089137ee63505b85ee7ddf0e75cb797c835d41.tar.lz craftbukkit-5f089137ee63505b85ee7ddf0e75cb797c835d41.tar.xz craftbukkit-5f089137ee63505b85ee7ddf0e75cb797c835d41.zip |
Cleanup comments, formatting, etc
Diffstat (limited to 'src/main/java/net/minecraft/server/ChunkProviderServer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ChunkProviderServer.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java index d5887a98..8b280ab1 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -11,7 +11,6 @@ import java.util.Set; import java.util.Random; import org.bukkit.Server; -import org.bukkit.craftbukkit.chunkio.ChunkIOExecutor; import org.bukkit.craftbukkit.util.LongHash; import org.bukkit.craftbukkit.util.LongHashSet; import org.bukkit.craftbukkit.util.LongObjectHashMap; @@ -80,7 +79,7 @@ public class ChunkProviderServer implements IChunkProvider { } } - // CraftBukkit start - add async variant, provide compatibility + // CraftBukkit start - Add async variant, provide compatibility public Chunk getChunkAt(int i, int j) { return getChunkAt(i, j, null); } @@ -97,7 +96,7 @@ public class ChunkProviderServer implements IChunkProvider { // If the chunk exists but isn't loaded do it async if (chunk == null && runnable != null && loader != null && loader.chunkExists(this.world, i, j)) { - ChunkIOExecutor.queueChunkLoad(this.world, loader, this, i, j, runnable); + org.bukkit.craftbukkit.chunkio.ChunkIOExecutor.queueChunkLoad(this.world, loader, this, i, j, runnable); return null; } // CraftBukkit end @@ -115,7 +114,7 @@ public class ChunkProviderServer implements IChunkProvider { CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Chunk to be generated"); crashreportsystemdetails.a("Location", String.format("%d,%d", new Object[] { Integer.valueOf(i), Integer.valueOf(j)})); - crashreportsystemdetails.a("Position hash", Long.valueOf(LongHash.toLong(i, j))); + crashreportsystemdetails.a("Position hash", Long.valueOf(LongHash.toLong(i, j))); // CraftBukkit - Use LongHash crashreportsystemdetails.a("Generator", this.chunkProvider.getName()); throw new ReportedException(crashreport); } @@ -208,7 +207,7 @@ public class ChunkProviderServer implements IChunkProvider { this.e.a(this.world, chunk); } catch (Exception ioexception) { // CraftBukkit - IOException -> Exception ioexception.printStackTrace(); - // CraftBukkit start - remove extra exception + // CraftBukkit start - Remove extra exception } // } catch (ExceptionWorldConflict exceptionworldconflict) { // exceptionworldconflict.printStackTrace(); |