Update CraftBukkit to Minecraft 1.4.5.
Dieser Commit ist enthalten in:
Ursprung
8e806550d7
Commit
6952ad1e59
6
pom.xml
6
pom.xml
@ -4,7 +4,7 @@
|
|||||||
<groupId>org.bukkit</groupId>
|
<groupId>org.bukkit</groupId>
|
||||||
<artifactId>craftbukkit</artifactId>
|
<artifactId>craftbukkit</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<version>1.4.4-R0.1-SNAPSHOT</version>
|
<version>1.4.5-R0.1-SNAPSHOT</version>
|
||||||
<name>CraftBukkit</name>
|
<name>CraftBukkit</name>
|
||||||
<url>http://www.bukkit.org</url>
|
<url>http://www.bukkit.org</url>
|
||||||
|
|
||||||
@ -51,14 +51,14 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bukkit</groupId>
|
<groupId>org.bukkit</groupId>
|
||||||
<artifactId>bukkit</artifactId>
|
<artifactId>bukkit</artifactId>
|
||||||
<version>1.4.4-R0.1-SNAPSHOT</version>
|
<version>1.4.5-R0.1-SNAPSHOT</version>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bukkit</groupId>
|
<groupId>org.bukkit</groupId>
|
||||||
<artifactId>minecraft-server</artifactId>
|
<artifactId>minecraft-server</artifactId>
|
||||||
<version>1.4.4</version>
|
<version>1.4.5</version>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -47,7 +47,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|||||||
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 1.4.4");
|
log.info("Starting minecraft server version 1.4.5");
|
||||||
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
|
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\"");
|
log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
|
||||||
}
|
}
|
||||||
|
@ -287,9 +287,13 @@ public class EntityWolf extends EntityTameableAnimal {
|
|||||||
|
|
||||||
public EntityWolf b(EntityAgeable entityageable) {
|
public EntityWolf b(EntityAgeable entityageable) {
|
||||||
EntityWolf entitywolf = new EntityWolf(this.world);
|
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;
|
return entitywolf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -755,7 +755,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getVersion() {
|
public String getVersion() {
|
||||||
return "1.4.4";
|
return "1.4.5";
|
||||||
}
|
}
|
||||||
|
|
||||||
public int y() {
|
public int y() {
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren