From 6952ad1e59e4bb7fd211d6fe7ac69670c47b705a Mon Sep 17 00:00:00 2001
From: Travis Watkins <amaranth@ubuntu.com>
Date: Fri, 16 Nov 2012 10:13:34 -0600
Subject: Update CraftBukkit to Minecraft 1.4.5.

---
 pom.xml                                                 | 6 +++---
 src/main/java/net/minecraft/server/DedicatedServer.java | 2 +-
 src/main/java/net/minecraft/server/EntityWolf.java      | 8 ++++++--
 src/main/java/net/minecraft/server/MinecraftServer.java | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index d171c7b8..1d66fed4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 1311fcb1..3b0ec70b 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 4345e003..74e98c49 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 132f3e76..f0e6cf73 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() {
-- 
cgit v1.2.3