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

Update for 1.6.3

Browse Source
This commit is contained in:
Dinnerbone 2011-05-26 14:28:58 +01:00
parent 6903f20242
commit dc76d3a64a
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minecraft/server/EntityPlayer.java
View File

@ -51,11 +51,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.br = 0.0F; this.br = 0.0F;
this.name = s; this.name = s;
this.height = 0.0F; 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 // CraftBukkit start
this.displayName = this.name; this.displayName = this.name;

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

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

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

@ -283,11 +283,7 @@ public class World implements IBlockAccess {
if (this.setRawData(i, j, k, l)) { if (this.setRawData(i, j, k, l)) {
int i1 = this.getTypeId(i, j, k); int i1 = this.getTypeId(i, j, k);
if (Block.t[i1 & 255]) { this.update(i, j, k, i1);
this.update(i, j, k, i1);
} else {
this.applyPhysics(i, j, k, i1);
}
} }
} }

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

@ -59,7 +59,7 @@ import org.bukkit.util.config.Configuration;
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.6.2"; private final String protocolVersion = "1.6.3";
private final PluginManager pluginManager = new SimplePluginManager(this); private final PluginManager pluginManager = new SimplePluginManager(this);
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);