diff --git a/pom.xml b/pom.xml index d171c7b8d8..1d66fed411 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.bukkit craftbukkit jar - 1.4.4-R0.1-SNAPSHOT + 1.4.5-R0.1-SNAPSHOT CraftBukkit http://www.bukkit.org @@ -51,14 +51,14 @@ org.bukkit bukkit - 1.4.4-R0.1-SNAPSHOT + 1.4.5-R0.1-SNAPSHOT jar compile org.bukkit minecraft-server - 1.4.4 + 1.4.5 jar compile diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java index 1311fcb1f2..3b0ec70b02 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -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\""); } diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java index 4345e003a4..74e98c49d3 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -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; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 132f3e76c9..f0e6cf7338 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -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() {