summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-06-30 15:47:36 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-06-30 15:47:36 +0100
commit61a7a0633c9a4229288031f915867afac3df6422 (patch)
tree6512b1535172287dbc08a71e9804b65b4f3ce163 /src
parenta679e7f38025924dba3dd688ccb87e92306c4c3e (diff)
downloadcraftbukkit-61a7a0633c9a4229288031f915867afac3df6422.tar
craftbukkit-61a7a0633c9a4229288031f915867afac3df6422.tar.gz
craftbukkit-61a7a0633c9a4229288031f915867afac3df6422.tar.lz
craftbukkit-61a7a0633c9a4229288031f915867afac3df6422.tar.xz
craftbukkit-61a7a0633c9a4229288031f915867afac3df6422.zip
Update to minecraft 1.7_01
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java2
-rw-r--r--src/main/java/net/minecraft/server/World.java62
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java2
3 files changed, 30 insertions, 36 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 16928000..625d8cc8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -89,7 +89,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true));
// CraftBukkit end
- log.info("Starting minecraft server version Beta 1.7");
+ log.info("Starting minecraft server version Beta 1.7_01");
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
log.warning("**** NOT ENOUGH RAM!");
log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 494c2262..5f2d404d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1609,44 +1609,38 @@ public class World implements IBlockAccess {
++A;
try {
- if (A == 50) {
- return;
- }
-
- int k1 = (l + i) / 2;
- int l1 = (j1 + k) / 2;
-
- if (this.isLoaded(k1, 64, l1)) {
- if (this.getChunkAtWorldCoords(k1, l1).isEmpty()) {
- return;
- }
-
- int i2 = this.C.size();
- int j2;
-
- if (flag) {
- j2 = 5;
- if (j2 > i2) {
- j2 = i2;
- }
-
- for (int k2 = 0; k2 < j2; ++k2) {
- MetadataChunkBlock metadatachunkblock = (MetadataChunkBlock) this.C.get(this.C.size() - k2 - 1);
+ if (A != 50) {
+ int k1 = (l + i) / 2;
+ int l1 = (j1 + k) / 2;
+
+ if (this.isLoaded(k1, 64, l1)) {
+ if (!this.getChunkAtWorldCoords(k1, l1).isEmpty()) {
+ int i2 = this.C.size();
+ int j2;
+
+ if (flag) {
+ j2 = 5;
+ if (j2 > i2) {
+ j2 = i2;
+ }
+
+ for (int k2 = 0; k2 < j2; ++k2) {
+ MetadataChunkBlock metadatachunkblock = (MetadataChunkBlock) this.C.get(this.C.size() - k2 - 1);
+
+ if (metadatachunkblock.a == enumskyblock && metadatachunkblock.a(i, j, k, l, i1, j1)) {
+ return;
+ }
+ }
+ }
- if (metadatachunkblock.a == enumskyblock && metadatachunkblock.a(i, j, k, l, i1, j1)) {
- return;
+ this.C.add(new MetadataChunkBlock(enumskyblock, i, j, k, l, i1, j1));
+ j2 = 1000000;
+ if (this.C.size() > 1000000) {
+ System.out.println("More than " + j2 + " updates, aborting lighting updates");
+ this.C.clear();
}
}
}
-
- this.C.add(new MetadataChunkBlock(enumskyblock, i, j, k, l, i1, j1));
- j2 = 1000000;
- if (this.C.size() > 1000000) {
- System.out.println("More than " + j2 + " updates, aborting lighting updates");
- this.C.clear();
- }
-
- return;
}
} finally {
--A;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 99a3b81a..ba30a30d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -65,7 +65,7 @@ import org.bukkit.util.config.ConfigurationNode;
public final class CraftServer implements Server {
private final String serverName = "Craftbukkit";
private final String serverVersion;
- private final String protocolVersion = "1.7";
+ private final String protocolVersion = "1.7_01";
private final ServicesManager servicesManager = new SimpleServicesManager();
private final BukkitScheduler scheduler = new CraftScheduler(this);
private final SimpleCommandMap commandMap = new SimpleCommandMap(this);