Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-12 12:16:41 +01:00
Code Issues Projects Releases Wiki Activity

Update for Minecraft 1.8.1

Browse Source
This commit is contained in:
Dinnerbone 2011-09-15 18:01:13 +01:00
parent 2b5a61f03d
commit 9252230e3a
5 changed files with 25 additions and 13 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.8_02</version> <version>1.8.1</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

16
src/main/java/net/minecraft/server/ContainerPlayer.java
View File

@ -82,13 +82,19 @@ public class ContainerPlayer extends Container {
itemstack = itemstack1.cloneItemStack(); itemstack = itemstack1.cloneItemStack();
if (i == 0) { if (i == 0) {
this.a(itemstack1, 9, 45, true); if (!this.a(itemstack1, 9, 45, true)) {
return null;
}
} else if (i >= 9 && i < 36) { } else if (i >= 9 && i < 36) {
this.a(itemstack1, 36, 45, false); if (!this.a(itemstack1, 36, 45, false)) {
return null;
}
} else if (i >= 36 && i < 45) { } else if (i >= 36 && i < 45) {
this.a(itemstack1, 9, 36, false); if (!this.a(itemstack1, 9, 36, false)) {
} else { return null;
this.a(itemstack1, 9, 45, false); }
} else if (!this.a(itemstack1, 9, 45, false)) {
return null;
} }
if (itemstack1.count == 0) { if (itemstack1.count == 0) {

16
src/main/java/net/minecraft/server/ContainerWorkbench.java
View File

@ -77,13 +77,19 @@ public class ContainerWorkbench extends Container {
itemstack = itemstack1.cloneItemStack(); itemstack = itemstack1.cloneItemStack();
if (i == 0) { if (i == 0) {
this.a(itemstack1, 10, 46, true); if (!this.a(itemstack1, 10, 46, true)) {
return null;
}
} else if (i >= 10 && i < 37) { } else if (i >= 10 && i < 37) {
this.a(itemstack1, 37, 46, false); if (!this.a(itemstack1, 37, 46, false)) {
return null;
}
} else if (i >= 37 && i < 46) { } else if (i >= 37 && i < 46) {
this.a(itemstack1, 10, 37, false); if (!this.a(itemstack1, 10, 37, false)) {
} else { return null;
this.a(itemstack1, 10, 46, false); }
} else if (!this.a(itemstack1, 10, 46, false)) {
return null;
} }
if (itemstack1.count == 0) { if (itemstack1.count == 0) {

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

@ -91,7 +91,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.8"); log.info("Starting minecraft server version Beta 1.8.1");
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\"");

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

@ -80,7 +80,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
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.8"; private final String protocolVersion = "1.8.1";
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);