SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge: 1.7.9

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-17 20:47:40 +01:00
parent 6bbb74e114
commit 1f1443ed34
20 changed files with 68 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0125-Old-New-Version-Support.patch
View File

@@ -1,4 +1,4 @@
From d599a3be18665b9ca05fd1eabde7b0e2e3e5ff23 Mon Sep 17 00:00:00 2001
From db0c6edd29ec690814c9a07bb9c5e4a20237b12d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 15:11:15 +1000
Subject: [PATCH] Old / New Version Support.
@@ -28,10 +28,10 @@ index ee24038..2ef286e 100644
this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
this.b.close(chatcomponenttext);
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index e8e20fd..8514dd6 100644
index 31d6008..0c10e18 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -46,6 +46,19 @@ public class NetworkManager extends SimpleChannelInboundHandler {
@@ -47,6 +47,19 @@ public class NetworkManager extends SimpleChannelInboundHandler {
private EnumProtocol p;
private IChatBaseComponent q;
private boolean r;
@@ -214,5 +214,5 @@ index 6423aec..f1571f1 100644
this.networkManager.handle(new PacketStatusOutServerInfo(ping), new GenericFutureListener[0]);
// CraftBukkit end
--
1.8.3.2
1.8.5.2.msysgit.0