Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-12 15:08:27 +02:00
Code Issues Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.4.5.

Browse Source
This commit is contained in:
Travis Watkins 2012-11-16 10:13:34 -06:00
parent 8e806550d7
commit 6952ad1e59
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<packaging>jar</packaging>
<version>1.4.4-R0.1-SNAPSHOT</version>
<version>1.4.5-R0.1-SNAPSHOT</version>
<name>CraftBukkit</name>
<url>http://www.bukkit.org</url>
@ -51,14 +51,14 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.4.4-R0.1-SNAPSHOT</version>
<version>1.4.5-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>minecraft-server</artifactId>
<version>1.4.4</version>
<version>1.4.5</version>
<type>jar</type>
<scope>compile</scope>
</dependency>

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

@ -47,7 +47,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true));
// CraftBukkit end
log.info("Starting minecraft server version 1.4.4");
log.info("Starting minecraft server version 1.4.5");
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
}

8
src/main/java/net/minecraft/server/EntityWolf.java
View File

@ -287,9 +287,13 @@ public class EntityWolf extends EntityTameableAnimal {
public EntityWolf b(EntityAgeable entityageable) {
EntityWolf entitywolf = new EntityWolf(this.world);
String s = this.getOwnerName();
if (s != null && s.trim().length() > 0) {
entitywolf.setOwnerName(s);
entitywolf.setTamed(true);
}
entitywolf.setOwnerName(this.getOwnerName());
entitywolf.setTamed(true);
return entitywolf;
}

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

@ -755,7 +755,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public String getVersion() {
return "1.4.4";
return "1.4.5";
}
public int y() {