mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-06-26 14:35:05 +02:00
Compare commits
3 Commits
8fe8c6ddca
...
7266dcecff
Author | SHA1 | Date | |
---|---|---|---|
|
7266dcecff | ||
|
1231b4d27c | ||
|
cbdc902316 |
|
@ -1 +1 @@
|
|||
Subproject commit 336333acb1e6140556271545c71f784083559dcc
|
||||
Subproject commit 6e1751733f6b3dafe824dcd7f00d5ed86572ba37
|
|
@ -1,14 +1,14 @@
|
|||
From 76c901d6879fc774867b51da71abb31c10bdc8ab Mon Sep 17 00:00:00 2001
|
||||
From 46bb2e2fc11e4133b45c1c6af6e1e5d20043f9f1 Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
Date: Sun, 19 Jun 2022 10:31:51 +0100
|
||||
Subject: [PATCH] Expand packet-decode-logging usage
|
||||
|
||||
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
|
||||
index 206f4227..954ffbc9 100644
|
||||
index 6caf30cd..75e802d2 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
|
||||
@@ -152,6 +152,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
|
||||
@@ -155,6 +155,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
|
||||
ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - read timed out", handler );
|
||||
} else if ( cause instanceof DecoderException )
|
||||
{
|
||||
|
|
|
@ -0,0 +1,57 @@
|
|||
From fa7dcf4b0fa0b5aaf20c9071b547699ae43ab530 Mon Sep 17 00:00:00 2001
|
||||
From: BoomEaro <21033866+BoomEaro@users.noreply.github.com>
|
||||
Date: Mon, 3 Apr 2023 13:03:53 +0300
|
||||
Subject: [PATCH] Always slice until entity rewrite is being used in
|
||||
MinecraftDecoder
|
||||
|
||||
|
||||
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 ac83e325..b6950ff1 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
|
||||
@@ -20,6 +20,8 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
|
||||
private int protocolVersion;
|
||||
@Setter
|
||||
private boolean supportsForge = false;
|
||||
+ @Setter
|
||||
+ private boolean slice = true; // Waterfall
|
||||
|
||||
public MinecraftDecoder(Protocol protocol, boolean server, int protocolVersion) {
|
||||
this.protocol = protocol;
|
||||
@@ -38,7 +40,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
|
||||
}
|
||||
|
||||
Protocol.DirectionData prot = ( server ) ? protocol.TO_SERVER : protocol.TO_CLIENT;
|
||||
- ByteBuf slice = in.copy(); // Can't slice this one due to EntityMap :(
|
||||
+ ByteBuf slice = ( this.slice ? in.retainedSlice() : in.copy() ); // Waterfall
|
||||
|
||||
Object packetTypeInfo = null;
|
||||
try
|
||||
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 8181d76b..1e05104e 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
|
||||
@@ -385,6 +385,7 @@ public class ServerConnector extends PacketHandler
|
||||
ServerInfo from = ( user.getServer() == null ) ? null : user.getServer().getInfo();
|
||||
user.setServer( server );
|
||||
ch.getHandle().pipeline().get( HandlerBoss.class ).setHandler( new DownstreamBridge( bungee, user, server ) );
|
||||
+ ch.getHandle().pipeline().get( MinecraftDecoder.class ).setSlice( user.isDisableEntityMetadataRewrite() ); // Waterfall: Change decoder mode for downstream connection
|
||||
|
||||
bungee.getPluginManager().callEvent( new ServerSwitchEvent( user, from ) );
|
||||
|
||||
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 cf82c182..e3df5c82 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
@@ -158,6 +158,8 @@ public final class UserConnection implements ProxiedPlayer
|
||||
{
|
||||
this.entityRewrite = EntityMap.getEntityMap( getPendingConnection().getVersion() );
|
||||
|
||||
+ ch.getHandle().pipeline().get( MinecraftDecoder.class ).setSlice( isDisableEntityMetadataRewrite() ); // Waterfall: Change decoder mode for upstream connection
|
||||
+
|
||||
this.displayName = name;
|
||||
|
||||
tabListHandler = new ServerUnique( this );
|
||||
--
|
||||
2.33.0.windows.2
|
||||
|
Loading…
Reference in New Issue
Block a user