Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 11:06:29 +01:00
Code Issues Projects Releases Wiki Activity

Update to minecraft 1.7_01

Browse Source
This commit is contained in:
Dinnerbone 2011-06-30 15:47:36 +01:00
parent a679e7f380
commit 61a7a0633c
4 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -39,7 +39,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>minecraft-server</artifactId> <artifactId>minecraft-server</artifactId>
<version>1.7</version> <version>1.7_01</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

2
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@ -89,7 +89,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true)); System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true));
// CraftBukkit end // 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) { if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
log.warning("**** NOT ENOUGH RAM!"); log.warning("**** NOT ENOUGH RAM!");
log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");

54
src/main/java/net/minecraft/server/World.java
View File

@ -1609,44 +1609,38 @@ public class World implements IBlockAccess {
++A; ++A;
try { try {
if (A == 50) { if (A != 50) {
return; int k1 = (l + i) / 2;
} int l1 = (j1 + k) / 2;
int k1 = (l + i) / 2; if (this.isLoaded(k1, 64, l1)) {
int l1 = (j1 + k) / 2; if (!this.getChunkAtWorldCoords(k1, l1).isEmpty()) {
int i2 = this.C.size();
int j2;
if (this.isLoaded(k1, 64, l1)) { if (flag) {
if (this.getChunkAtWorldCoords(k1, l1).isEmpty()) { j2 = 5;
return; if (j2 > i2) {
} j2 = i2;
}
int i2 = this.C.size(); for (int k2 = 0; k2 < j2; ++k2) {
int j2; MetadataChunkBlock metadatachunkblock = (MetadataChunkBlock) this.C.get(this.C.size() - k2 - 1);
if (flag) { if (metadatachunkblock.a == enumskyblock && metadatachunkblock.a(i, j, k, l, i1, j1)) {
j2 = 5; return;
if (j2 > i2) { }
j2 = i2; }
} }
for (int k2 = 0; k2 < j2; ++k2) { this.C.add(new MetadataChunkBlock(enumskyblock, i, j, k, l, i1, j1));
MetadataChunkBlock metadatachunkblock = (MetadataChunkBlock) this.C.get(this.C.size() - k2 - 1); j2 = 1000000;
if (this.C.size() > 1000000) {
if (metadatachunkblock.a == enumskyblock && metadatachunkblock.a(i, j, k, l, i1, j1)) { System.out.println("More than " + j2 + " updates, aborting lighting updates");
return; 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 { } finally {
--A; --A;

2
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -65,7 +65,7 @@ import org.bukkit.util.config.ConfigurationNode;
public final class CraftServer implements Server { public final class CraftServer implements Server {
private final String serverName = "Craftbukkit"; private final String serverName = "Craftbukkit";
private final String serverVersion; 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 ServicesManager servicesManager = new SimpleServicesManager();
private final BukkitScheduler scheduler = new CraftScheduler(this); private final BukkitScheduler scheduler = new CraftScheduler(this);
private final SimpleCommandMap commandMap = new SimpleCommandMap(this); private final SimpleCommandMap commandMap = new SimpleCommandMap(this);