mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-10-01 07:57:31 +02:00
Updated Upstream (Waterfall)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes:7ec32c4
Temp 1.16.1 proto support3781053
Fix POM7bb1088
Updated Upstream (BungeeCord)
This commit is contained in:
parent
a5899209c8
commit
f3ed193b0c
@ -1 +1 @@
|
||||
Subproject commit 360fdcf5317b3cf91dfae73ed4ad837f6d72c7bc
|
||||
Subproject commit 7ec32c42269926258e7aa33e98e8a21efac3c883
|
@ -1,4 +1,4 @@
|
||||
From 0fcb8dddcb7e2191ddeeeae65fd222f40a2224a1 Mon Sep 17 00:00:00 2001
|
||||
From b4915fbd2ba2e74cbd18d204f472b58aaf0c4aa1 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
|
||||
@ -6,7 +6,7 @@ Subject: [PATCH] 1.7.x Protocol Patch
|
||||
|
||||
diff --git a/protocol/src/main/java/io/github/waterfallmc/travertine/protocol/MultiVersionPacketV17.java b/protocol/src/main/java/io/github/waterfallmc/travertine/protocol/MultiVersionPacketV17.java
|
||||
new file mode 100644
|
||||
index 00000000..90064112
|
||||
index 000000000..90064112e
|
||||
--- /dev/null
|
||||
+++ b/protocol/src/main/java/io/github/waterfallmc/travertine/protocol/MultiVersionPacketV17.java
|
||||
@@ -0,0 +1,90 @@
|
||||
@ -101,7 +101,7 @@ 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 68c716b9..3f1bf41e 100644
|
||||
index 68c716b9b..3f1bf41e9 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
|
||||
@@ -241,6 +241,11 @@ public abstract class DefinedPacket
|
||||
@ -129,7 +129,7 @@ index 68c716b9..3f1bf41e 100644
|
||||
|
||||
@Override
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
|
||||
index 6c3c7ab8..2fbbd476 100644
|
||||
index 6c3c7ab8d..2fbbd4760 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
|
||||
@@ -5,10 +5,11 @@ import io.netty.buffer.ByteBufUtil;
|
||||
@ -155,7 +155,7 @@ index 6c3c7ab8..2fbbd476 100644
|
||||
if ( in.isReadable() )
|
||||
{
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java
|
||||
index d4b03843..9aac7ca9 100644
|
||||
index d4b038434..9aac7ca9f 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java
|
||||
@@ -21,6 +21,6 @@ public class MinecraftEncoder extends MessageToByteEncoder<DefinedPacket>
|
||||
@ -167,7 +167,7 @@ index d4b03843..9aac7ca9 100644
|
||||
}
|
||||
}
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
|
||||
index 546564fb..9d3fa90e 100644
|
||||
index 546564fbe..9d3fa90ef 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
|
||||
@@ -55,7 +55,7 @@ public enum Protocol
|
||||
@ -462,7 +462,7 @@ index 546564fb..9d3fa90e 100644
|
||||
|
||||
java.util.function.Supplier<? extends DefinedPacket> constructor = protocolData.packetConstructors[id]; // Waterfall - speed up packet construction
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
|
||||
index 7da62425..bccaf662 100644
|
||||
index e11076fd5..405c9cc81 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
|
||||
@@ -6,6 +6,8 @@ import java.util.List;
|
||||
@ -474,15 +474,15 @@ index 7da62425..bccaf662 100644
|
||||
public static final int MINECRAFT_1_8 = 47;
|
||||
public static final int MINECRAFT_1_9 = 107;
|
||||
public static final int MINECRAFT_1_9_1 = 108;
|
||||
@@ -30,6 +32,7 @@ public class ProtocolConstants
|
||||
public static final int MINECRAFT_1_15_2 = 578;
|
||||
@@ -31,6 +33,7 @@ public class ProtocolConstants
|
||||
public static final int MINECRAFT_1_16 = 735;
|
||||
public static final int MINECRAFT_1_16_1 = 736; // Waterfall
|
||||
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
|
||||
+ "1.7.x",
|
||||
"1.8.x",
|
||||
"1.9.x",
|
||||
"1.10.x",
|
||||
@@ -41,6 +44,8 @@ public class ProtocolConstants
|
||||
@@ -42,6 +45,8 @@ public class ProtocolConstants
|
||||
"1.16.x"
|
||||
);
|
||||
public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
|
||||
@ -492,7 +492,7 @@ index 7da62425..bccaf662 100644
|
||||
ProtocolConstants.MINECRAFT_1_9,
|
||||
ProtocolConstants.MINECRAFT_1_9_1,
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
|
||||
index 743d65e4..37bf6b4b 100644
|
||||
index 743d65e43..37bf6b4b1 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
|
||||
@@ -6,10 +6,12 @@ import io.netty.channel.ChannelHandlerContext;
|
||||
@ -526,7 +526,7 @@ index 743d65e4..37bf6b4b 100644
|
||||
|
||||
if ( in.readableBytes() < length )
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
|
||||
index d2a4dea6..ac47302b 100644
|
||||
index d2a4dea6f..ac47302bd 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -576,7 +576,7 @@ index d2a4dea6..ac47302b 100644
|
||||
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||
{
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java
|
||||
index 9daf7a73..b7640fcb 100644
|
||||
index 9daf7a737..b7640fcbf 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java
|
||||
@@ -1,5 +1,7 @@
|
||||
@ -637,7 +637,7 @@ index 9daf7a73..b7640fcb 100644
|
||||
public void handle(AbstractPacketHandler handler) throws Exception
|
||||
{
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java
|
||||
index a29524ca..8d9f4ccb 100644
|
||||
index a29524ca8..8d9f4ccb3 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java
|
||||
@@ -1,25 +1,35 @@
|
||||
@ -696,7 +696,7 @@ index a29524ca..8d9f4ccb 100644
|
||||
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||
{
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
|
||||
index 388f6cdb..7f124322 100644
|
||||
index 388f6cdb9..7f1243227 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -746,7 +746,7 @@ index 388f6cdb..7f124322 100644
|
||||
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||
{
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java
|
||||
index d11a9ea9..07fc21b6 100644
|
||||
index d11a9ea9d..07fc21b65 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java
|
||||
@@ -1,18 +1,19 @@
|
||||
@ -802,7 +802,7 @@ index d11a9ea9..07fc21b6 100644
|
||||
public void write(ByteBuf buf) {
|
||||
writeVarInt(this.entityId, buf);
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityRemoveEffect.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityRemoveEffect.java
|
||||
index 7ed2dc3a..9f8d56fc 100644
|
||||
index 7ed2dc3ab..9f8d56fc7 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityRemoveEffect.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityRemoveEffect.java
|
||||
@@ -1,18 +1,18 @@
|
||||
@ -855,7 +855,7 @@ index 7ed2dc3a..9f8d56fc 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/KeepAlive.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/KeepAlive.java
|
||||
index b004bc41..0c2eb022 100644
|
||||
index b004bc416..0c2eb022f 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/KeepAlive.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/KeepAlive.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -901,7 +901,7 @@ index b004bc41..0c2eb022 100644
|
||||
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||
{
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
|
||||
index 551bd104..ac8751f6 100644
|
||||
index 551bd1046..ac8751f6e 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
|
||||
@@ -23,6 +23,11 @@ public class LoginSuccess extends DefinedPacket
|
||||
@ -944,7 +944,7 @@ index 551bd104..ac8751f6 100644
|
||||
+ // Travertine end
|
||||
}
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
|
||||
index 92bacc7c..c919f961 100644
|
||||
index 92bacc7cd..c919f961a 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
|
||||
@@ -1,5 +1,7 @@
|
||||
@ -1000,7 +1000,7 @@ index 92bacc7c..c919f961 100644
|
||||
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||
{
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
|
||||
index 17e12655..c49c5a56 100644
|
||||
index 17e12655d..c49c5a567 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
|
||||
@@ -3,6 +3,8 @@ package net.md_5.bungee.protocol.packet;
|
||||
@ -1054,7 +1054,7 @@ index 17e12655..c49c5a56 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 3c7905d5..fe290fa3 100644
|
||||
index 3c7905d54..fe290fa3c 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
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1108,7 +1108,7 @@ index 3c7905d5..fe290fa3 100644
|
||||
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||
{
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java
|
||||
index 0b27fc86..74066702 100644
|
||||
index 0b27fc86b..74066702c 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1170,7 +1170,7 @@ index 0b27fc86..74066702 100644
|
||||
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||
{
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
|
||||
index 27b232dc..6c2cef1e 100644
|
||||
index 27b232dcb..6c2cef1ee 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1219,7 +1219,7 @@ index 27b232dc..6c2cef1e 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 a5555f6a..415a4bcd 100644
|
||||
index a5555f6af..415a4bcde 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
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1302,7 +1302,7 @@ index a5555f6a..415a4bcd 100644
|
||||
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||
{
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
index e157374f..db8e9996 100644
|
||||
index e157374f2..db8e9996c 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
@@ -171,6 +171,14 @@ public class BungeeCord extends ProxyServer
|
||||
@ -1321,7 +1321,7 @@ index e157374f..db8e9996 100644
|
||||
private ConnectionThrottle connectionThrottle;
|
||||
private final ModuleManager moduleManager = new ModuleManager();
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeTitle.java b/proxy/src/main/java/net/md_5/bungee/BungeeTitle.java
|
||||
index 494213db..1d89acf5 100644
|
||||
index 494213db8..1d89acf5b 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeTitle.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeTitle.java
|
||||
@@ -5,6 +5,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
|
||||
@ -1341,7 +1341,7 @@ index 494213db..1d89acf5 100644
|
||||
sendPacket( player, reset );
|
||||
sendPacket( player, times );
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java b/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
|
||||
index 491cf1a1..299a216c 100644
|
||||
index 491cf1a16..299a216cd 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
|
||||
@@ -10,17 +10,32 @@ import com.google.gson.JsonSerializer;
|
||||
@ -1396,7 +1396,7 @@ index 491cf1a1..299a216c 100644
|
||||
}
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
||||
index bb4e7ec2..eec0e0e1 100644
|
||||
index 170b590be..4bdcbdc6b 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
||||
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufAllocator;
|
||||
@ -1457,7 +1457,7 @@ index bb4e7ec2..eec0e0e1 100644
|
||||
throw CancelSendSignal.INSTANCE;
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
index 4826f0d5..76a91bc4 100644
|
||||
index 4826f0d56..76a91bc4d 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
@@ -193,6 +193,7 @@ public final class UserConnection implements ProxiedPlayer
|
||||
@ -1512,7 +1512,7 @@ index 4826f0d5..76a91bc4 100644
|
||||
{
|
||||
this.compressionThreshold = compressionThreshold;
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
||||
index daac8604..5fbc61a9 100644
|
||||
index daac86045..5fbc61a9f 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
||||
@@ -20,6 +20,7 @@ import io.netty.buffer.Unpooled;
|
||||
@ -1581,7 +1581,7 @@ index daac8604..5fbc61a9 100644
|
||||
con.unsafe().sendPacket( pluginMessage );
|
||||
throw CancelSendSignal.INSTANCE;
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index b848e451..f4e0e9bc 100644
|
||||
index b848e4515..f4e0e9bcb 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -12,6 +12,13 @@ import java.util.List;
|
||||
@ -1630,7 +1630,7 @@ index b848e451..f4e0e9bc 100644
|
||||
};
|
||||
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
|
||||
index 6df3f3dd..6cd71071 100644
|
||||
index 6df3f3dd9..6cd71071e 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
|
||||
@@ -16,6 +16,7 @@ import net.md_5.bungee.protocol.MinecraftDecoder;
|
||||
@ -1651,7 +1651,7 @@ index 6df3f3dd..6cd71071 100644
|
||||
( (BungeeServerInfo) target ).cachePing( serverPing );
|
||||
callback.done( serverPing, null );
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
index 7913d40c..0994bebd 100644
|
||||
index 7913d40cc..0994bebd9 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
@@ -84,7 +84,12 @@ public class UpstreamBridge extends PacketHandler
|
||||
@ -1669,7 +1669,7 @@ index 7913d40c..0994bebd 100644
|
||||
con.getServer().disconnect( "Quitting" );
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
|
||||
index ef2a66fa..c8ac14da 100644
|
||||
index 0e6395baa..593152ce0 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
|
||||
@@ -35,6 +35,10 @@ public abstract class EntityMap
|
||||
@ -1685,7 +1685,7 @@ index ef2a66fa..c8ac14da 100644
|
||||
case ProtocolConstants.MINECRAFT_1_9:
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_2.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_2.java
|
||||
new file mode 100644
|
||||
index 00000000..65c1a9ec
|
||||
index 000000000..65c1a9ec8
|
||||
--- /dev/null
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_2.java
|
||||
@@ -0,0 +1,102 @@
|
||||
@ -1793,7 +1793,7 @@ index 00000000..65c1a9ec
|
||||
+// Travertine end
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_6.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_6.java
|
||||
new file mode 100644
|
||||
index 00000000..6755fe84
|
||||
index 000000000..6755fe845
|
||||
--- /dev/null
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_6.java
|
||||
@@ -0,0 +1,62 @@
|
||||
@ -1860,7 +1860,7 @@ index 00000000..6755fe84
|
||||
+}
|
||||
+// Travertine end
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
|
||||
index bea2bbff..f61de127 100644
|
||||
index bea2bbff9..f61de1278 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
|
||||
@@ -8,6 +8,7 @@ import lombok.Getter;
|
||||
@ -1908,7 +1908,7 @@ index bea2bbff..f61de127 100644
|
||||
+
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandshakeState.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandshakeState.java
|
||||
index 5e02f8c8..e3c1b9b9 100644
|
||||
index 5e02f8c8a..e3c1b9b95 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandshakeState.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandshakeState.java
|
||||
@@ -3,6 +3,7 @@ package net.md_5.bungee.forge;
|
||||
@ -1943,7 +1943,7 @@ index 5e02f8c8..e3c1b9b9 100644
|
||||
|
||||
return WAITINGSERVERDATA;
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java b/proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java
|
||||
index daf12f74..e33861ab 100644
|
||||
index daf12f74e..e33861abb 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java
|
||||
@@ -4,12 +4,14 @@ import java.util.Collection;
|
||||
@ -2038,5 +2038,5 @@ index daf12f74..e33861ab 100644
|
||||
|
||||
@Override
|
||||
--
|
||||
2.17.1
|
||||
2.27.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user