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

Update CraftBukkit to Minecraft 1.7.9

Browse Source
This commit is contained in:
Nate Mortensen 2014-04-15 20:45:03 -06:00 committed by Travis Watkins
parent 98555224aa
commit 7e54acc8bd
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<packaging>jar</packaging>
<version>1.7.8-R0.1-SNAPSHOT</version>
<version>1.7.9-R0.1-SNAPSHOT</version>
<name>CraftBukkit</name>
<url>http://www.bukkit.org</url>
@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version>
<junit.version>4.11</junit.version>
<minecraft.version>1.7.8</minecraft.version>
<minecraft.version>1.7.9</minecraft.version>
<minecraft_version>1_7_R3</minecraft_version>
<buildtag.prefix>git-Bukkit-</buildtag.prefix>
<buildtag.suffix></buildtag.suffix>

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

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

4
src/main/java/net/minecraft/server/HandshakeListener.java
View File

@ -64,11 +64,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
// CraftBukkit end
if (packethandshakinginsetprotocol.d() > 5) {
chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.8");
chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.9");
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
this.b.close(chatcomponenttext);
} else if (packethandshakinginsetprotocol.d() < 5) {
chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.7.8");
chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.7.9");
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
this.b.close(chatcomponenttext);
} else {

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

@ -438,7 +438,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
long j = 0L;
this.q.setMOTD(new ChatComponentText(this.motd));
this.q.setServerInfo(new ServerPingServerData("1.7.8", 5));
this.q.setServerInfo(new ServerPingServerData("1.7.9", 5));
this.a(this.q);
while (this.isRunning) {
@ -827,7 +827,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public String getVersion() {
return "1.7.8";
return "1.7.9";
}
public int C() {

11
src/main/java/net/minecraft/server/NetworkManager.java
View File

@ -13,6 +13,7 @@ import net.minecraft.util.io.netty.channel.SimpleChannelInboundHandler;
import net.minecraft.util.io.netty.channel.local.LocalChannel;
import net.minecraft.util.io.netty.channel.local.LocalServerChannel;
import net.minecraft.util.io.netty.channel.nio.NioEventLoopGroup;
import net.minecraft.util.io.netty.handler.timeout.TimeoutException;
import net.minecraft.util.io.netty.util.AttributeKey;
import net.minecraft.util.io.netty.util.concurrent.GenericFutureListener;
import net.minecraft.util.org.apache.commons.lang3.Validate;
@ -66,7 +67,15 @@ public class NetworkManager extends SimpleChannelInboundHandler {
}
public void exceptionCaught(ChannelHandlerContext channelhandlercontext, Throwable throwable) {
this.close(new ChatMessage("disconnect.genericReason", new Object[] { "Internal Exception: " + throwable}));
ChatMessage chatmessage;
if (throwable instanceof TimeoutException) {
chatmessage = new ChatMessage("disconnect.timeout", new Object[0]);
} else {
chatmessage = new ChatMessage("disconnect.genericReason", new Object[] { "Internal Exception: " + throwable});
}
this.close(chatmessage);
}
protected void a(ChannelHandlerContext channelhandlercontext, Packet packet) {