summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-05-26 14:28:58 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-05-26 14:30:16 +0100
commitdc76d3a64a8baa6cae9cfebf17f4459eb61495c2 (patch)
tree70efbde5498b64a40b57f44ef1991b49dcfe567e /src/main
parent6903f2024217f0959c015e76b23297af8e3b573f (diff)
downloadcraftbukkit-dc76d3a64a8baa6cae9cfebf17f4459eb61495c2.tar
craftbukkit-dc76d3a64a8baa6cae9cfebf17f4459eb61495c2.tar.gz
craftbukkit-dc76d3a64a8baa6cae9cfebf17f4459eb61495c2.tar.lz
craftbukkit-dc76d3a64a8baa6cae9cfebf17f4459eb61495c2.tar.xz
craftbukkit-dc76d3a64a8baa6cae9cfebf17f4459eb61495c2.zip
Update for 1.6.3
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/minecraft/server/EntityPlayer.java5
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java2
-rw-r--r--src/main/java/net/minecraft/server/World.java6
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java2
4 files changed, 3 insertions, 12 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 68169076..34b42364 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -51,11 +51,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.br = 0.0F;
this.name = s;
this.height = 0.0F;
- this.inventory.canHold(new ItemStack(Item.PAPER, 64));
- this.inventory.canHold(new ItemStack(Block.WORKBENCH, 64));
- this.inventory.canHold(new ItemStack(Item.COMPASS, 64));
- this.inventory.canHold(new ItemStack(Block.OBSIDIAN, 64));
- this.inventory.canHold(new ItemStack(Item.FLINT_AND_STEEL));
// CraftBukkit start
this.displayName = this.name;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5223328f..d146aebf 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -86,7 +86,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.6.2");
+ log.info("Starting minecraft server version Beta 1.6.3");
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 c5318ad1..457f41fe 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -283,11 +283,7 @@ public class World implements IBlockAccess {
if (this.setRawData(i, j, k, l)) {
int i1 = this.getTypeId(i, j, k);
- if (Block.t[i1 & 255]) {
- this.update(i, j, k, i1);
- } else {
- this.applyPhysics(i, j, k, i1);
- }
+ this.update(i, j, k, i1);
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index df6ee620..a479f35e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -59,7 +59,7 @@ import org.bukkit.util.config.Configuration;
public final class CraftServer implements Server {
private final String serverName = "Craftbukkit";
private final String serverVersion;
- private final String protocolVersion = "1.6.2";
+ private final String protocolVersion = "1.6.3";
private final PluginManager pluginManager = new SimplePluginManager(this);
private final ServicesManager servicesManager = new SimpleServicesManager();
private final BukkitScheduler scheduler = new CraftScheduler(this);