Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-26 18:47:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream ref: Drop 1.13 scoreboard api support

Browse Source
This commit is contained in:
Shane Freeder 2018-07-25 19:14:35 +01:00
parent 72289ab8e7
commit c3d5404c39
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit ed37fdbc41df8d3db52324eb4c460b00e7296909
Subproject commit e910db4871210f03efd8e43b67400745f7b9961b

36
Waterfall-Proxy-Patches/0004-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From c286d8e680f6b226bdf48950534239b5398d82e2 Mon Sep 17 00:00:00 2001
From 889411e2ea36b2edcb33869e480258701b9be30c 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
@ -101,10 +101,10 @@ index 00000000..90064112
+ }
+}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index f902301e..05cb6cb5 100644
index 10e16d79..04a34033 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -205,6 +205,11 @@ public abstract class DefinedPacket
@@ -193,6 +193,11 @@ public abstract class DefinedPacket
read( buf );
}
@ -116,7 +116,7 @@ index f902301e..05cb6cb5 100644
public void write(ByteBuf buf)
{
throw new UnsupportedOperationException( "Packet must implement write method" );
@@ -215,6 +220,11 @@ public abstract class DefinedPacket
@@ -203,6 +208,11 @@ public abstract class DefinedPacket
write( buf );
}
@ -744,18 +744,18 @@ index 0e06b49d..ac7451dc 100644
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
index 9f9c76fc..b7863ddf 100644
index 6279d9f3..b4a66baf 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
@@ -4,6 +4,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent; // Waterfall - 1.13
import net.md_5.bungee.chat.ComponentSerializer; // Waterfall - 1.13
@@ -1,6 +1,7 @@
package net.md_5.bungee.protocol.packet;
import net.md_5.bungee.protocol.DefinedPacket;
+import io.github.waterfallmc.travertine.protocol.MultiVersionPacketV17;
import io.netty.buffer.ByteBuf;
import java.util.Locale;
import lombok.AllArgsConstructor;
@@ -17,7 +18,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
@@ -14,7 +15,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ -764,7 +764,7 @@ index 9f9c76fc..b7863ddf 100644
{
private String name;
@@ -28,6 +29,16 @@ public class ScoreboardObjective extends DefinedPacket
@@ -25,6 +26,16 @@ public class ScoreboardObjective extends DefinedPacket
*/
private byte action;
@ -781,7 +781,7 @@ index 9f9c76fc..b7863ddf 100644
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@@ -49,6 +60,16 @@ public class ScoreboardObjective extends DefinedPacket
@@ -43,6 +54,16 @@ public class ScoreboardObjective extends DefinedPacket
}
}
@ -912,18 +912,18 @@ 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 8be62c7b..180f5146 100644
index f93508d9..13af5112 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
@@ -4,6 +4,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent; // Waterfall
import net.md_5.bungee.chat.ComponentSerializer; // Waterfall
@@ -1,6 +1,7 @@
package net.md_5.bungee.protocol.packet;
import net.md_5.bungee.protocol.DefinedPacket;
+import io.github.waterfallmc.travertine.protocol.MultiVersionPacketV17;
import io.netty.buffer.ByteBuf;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -16,7 +17,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
@@ -13,7 +14,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ -932,7 +932,7 @@ index 8be62c7b..180f5146 100644
{
private String name;
@@ -42,6 +43,31 @@ public class Team extends DefinedPacket
@@ -39,6 +40,31 @@ public class Team extends DefinedPacket
this.mode = 1;
}
@ -964,7 +964,7 @@ index 8be62c7b..180f5146 100644
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@@ -87,6 +113,30 @@ public class Team extends DefinedPacket
@@ -76,6 +102,30 @@ public class Team extends DefinedPacket
}
}