Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-29 19:11:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Shane Freeder 2018-07-21 19:57:00 +01:00
parent be8994ba31
commit fc46ad499f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit c8eb6aec7bac82fd309fa6d6113b8a0418317b01
Subproject commit b354bf04ef84d321c575094762e8d22b2b5ff45b

6
Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From bf98694b3459a3e4e2bee9f28981cf5663240e13 Mon Sep 17 00:00:00 2001
From f4d9338e64be970795cff14a838818105db1480b Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 10:31:04 -0500
Subject: [PATCH] 1.7.x Protocol Patch
@ -912,7 +912,7 @@ index f9eaa7ce..e174ac0b 100644
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
index 4c6f15d9..3b6b15d8 100644
index bb4f699b..d91515e6 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
@@ -3,6 +3,7 @@ package net.md_5.bungee.protocol.packet;
@ -964,7 +964,7 @@ index 4c6f15d9..3b6b15d8 100644
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@@ -82,6 +108,30 @@ public class Team extends DefinedPacket
@@ -89,6 +115,30 @@ public class Team extends DefinedPacket
}
}