Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-02-12 01:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PaperMC/Travertine into PaperMC-master

Browse Source
This commit is contained in:
LinsaFTW 2021-04-08 16:06:20 -03:00
commit 7df29fa62b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From 645dd7b625e6cda74114262e66edec565f7fda58 Mon Sep 17 00:00:00 2001 From 891ed926bf9e31d97a3c1b166c55666d32531d37 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 10:31:04 -0500 Date: Tue, 15 Nov 2016 10:31:04 -0500
Subject: [PATCH] 1.7.x Protocol Patch Subject: [PATCH] 1.7.x Protocol Patch
@ -1382,7 +1382,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 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 b486f2aa..c12085e1 100644 index 2d9c0cda..a4c25575 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/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; @@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufAllocator;
@ -1393,7 +1393,7 @@ index b486f2aa..c12085e1 100644
import java.util.Queue; import java.util.Queue;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@@ -268,10 +269,20 @@ public class ServerConnector extends PacketHandler @@ -270,10 +271,20 @@ public class ServerConnector extends PacketHandler
user.getServer().disconnect( "Quitting" ); user.getServer().disconnect( "Quitting" );
} else } else
{ {
@ -1418,7 +1418,7 @@ index b486f2aa..c12085e1 100644
} }
user.setDimension( login.getDimension() ); user.setDimension( login.getDimension() );
@@ -284,7 +295,7 @@ public class ServerConnector extends PacketHandler @@ -286,7 +297,7 @@ public class ServerConnector extends PacketHandler
if ( !user.isDisableEntityMetadataRewrite() ) { // Waterfall if ( !user.isDisableEntityMetadataRewrite() ) { // Waterfall
for ( Objective objective : serverScoreboard.getObjectives() ) for ( Objective objective : serverScoreboard.getObjectives() )
{ {
@ -1427,7 +1427,7 @@ index b486f2aa..c12085e1 100644
} }
for ( Score score : serverScoreboard.getScores() ) for ( Score score : serverScoreboard.getScores() )
{ {
@@ -454,6 +465,14 @@ public class ServerConnector extends PacketHandler @@ -456,6 +467,14 @@ public class ServerConnector extends PacketHandler
{ {
this.handshakeHandler.handle( pluginMessage ); this.handshakeHandler.handle( pluginMessage );
@ -2010,5 +2010,5 @@ index daf12f74..e33861ab 100644
@Override @Override
-- --
2.30.0 2.25.1