summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pom.xml2
-rw-r--r--src/main/java/net/minecraft/server/ContainerPlayer.java16
-rw-r--r--src/main/java/net/minecraft/server/ContainerWorkbench.java16
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java2
5 files changed, 25 insertions, 13 deletions
diff --git a/pom.xml b/pom.xml
index 41c01c2b..dbeb7918 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>minecraft-server</artifactId>
- <version>1.8_02</version>
+ <version>1.8.1</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
diff --git a/src/main/java/net/minecraft/server/ContainerPlayer.java b/src/main/java/net/minecraft/server/ContainerPlayer.java
index 9eed24c1..aa13bc7b 100644
--- a/src/main/java/net/minecraft/server/ContainerPlayer.java
+++ b/src/main/java/net/minecraft/server/ContainerPlayer.java
@@ -82,13 +82,19 @@ public class ContainerPlayer extends Container {
itemstack = itemstack1.cloneItemStack();
if (i == 0) {
- this.a(itemstack1, 9, 45, true);
+ if (!this.a(itemstack1, 9, 45, true)) {
+ return null;
+ }
} 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) {
- this.a(itemstack1, 9, 36, false);
- } else {
- this.a(itemstack1, 9, 45, false);
+ if (!this.a(itemstack1, 9, 36, false)) {
+ return null;
+ }
+ } else if (!this.a(itemstack1, 9, 45, false)) {
+ return null;
}
if (itemstack1.count == 0) {
diff --git a/src/main/java/net/minecraft/server/ContainerWorkbench.java b/src/main/java/net/minecraft/server/ContainerWorkbench.java
index 221cc768..f0e29fa0 100644
--- a/src/main/java/net/minecraft/server/ContainerWorkbench.java
+++ b/src/main/java/net/minecraft/server/ContainerWorkbench.java
@@ -77,13 +77,19 @@ public class ContainerWorkbench extends Container {
itemstack = itemstack1.cloneItemStack();
if (i == 0) {
- this.a(itemstack1, 10, 46, true);
+ if (!this.a(itemstack1, 10, 46, true)) {
+ return null;
+ }
} 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) {
- this.a(itemstack1, 10, 37, false);
- } else {
- this.a(itemstack1, 10, 46, false);
+ if (!this.a(itemstack1, 10, 37, false)) {
+ return null;
+ }
+ } else if (!this.a(itemstack1, 10, 46, false)) {
+ return null;
}
if (itemstack1.count == 0) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9d4125d1..713eb412 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -91,7 +91,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.8");
+ log.info("Starting minecraft server version Beta 1.8.1");
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/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 234eced6..2c8420d0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -80,7 +80,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
public final class CraftServer implements Server {
private final String serverName = "Craftbukkit";
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 BukkitScheduler scheduler = new CraftScheduler(this);
private final SimpleCommandMap commandMap = new SimpleCommandMap(this);