diff options
| author | Travis Watkins <amaranth@ubuntu.com> | 2012-11-16 10:13:34 -0600 |
|---|---|---|
| committer | Travis Watkins <amaranth@ubuntu.com> | 2012-11-16 10:13:34 -0600 |
| commit | 6952ad1e59e4bb7fd211d6fe7ac69670c47b705a (patch) | |
| tree | 7b8782c17b3580f3e8b2527a1ab1edd38db931e1 /src | |
| parent | 8e806550d7627d3cac3226bacef11ce73dd69bda (diff) | |
| download | craftbukkit-6952ad1e59e4bb7fd211d6fe7ac69670c47b705a.tar craftbukkit-6952ad1e59e4bb7fd211d6fe7ac69670c47b705a.tar.gz craftbukkit-6952ad1e59e4bb7fd211d6fe7ac69670c47b705a.tar.lz craftbukkit-6952ad1e59e4bb7fd211d6fe7ac69670c47b705a.tar.xz craftbukkit-6952ad1e59e4bb7fd211d6fe7ac69670c47b705a.zip | |
Update CraftBukkit to Minecraft 1.4.5.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/DedicatedServer.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityWolf.java | 8 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/MinecraftServer.java | 2 |
3 files changed, 8 insertions, 4 deletions
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() { |