Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-27 11:07:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix allowEmptyPackets setting to return real value (Fixes #357)

Browse Source
This commit is contained in:
Shane Freeder 2019-03-06 15:35:52 +00:00
parent 04edf2ee50
commit 504670360d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BungeeCord-Patches/0045-Add-Configuration-to-allow-empty-packets.patch
View File

@ -1,4 +1,4 @@
From 23381cff6c1af4999870811c3461c5fce1c8cb6b Mon Sep 17 00:00:00 2001 From a4251c9dab7b2441bb8893fc2ef9443225d9b50e Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 12 Oct 2018 14:28:52 +0100 Date: Fri, 12 Oct 2018 14:28:52 +0100
Subject: [PATCH] Add Configuration to allow empty packets Subject: [PATCH] Add Configuration to allow empty packets
@ -49,7 +49,7 @@ index 29e54dba..880a3dc7 100644
throw new CorruptedFrameException( "Empty Packet!" ); throw new CorruptedFrameException( "Empty Packet!" );
} }
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index d343e9b8..ea06f3ba 100644 index d343e9b8..04b21d0f 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java --- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java +++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -49,6 +49,17 @@ public class WaterfallConfiguration extends Configuration { @@ -49,6 +49,17 @@ public class WaterfallConfiguration extends Configuration {
@ -85,7 +85,7 @@ index d343e9b8..ea06f3ba 100644
+ +
+ @Override + @Override
+ public boolean isAllowEmptyPackets() { + public boolean isAllowEmptyPackets() {
+ return false; + return allowEmptyPackets;
+ } + }
} }
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@ -102,5 +102,5 @@ index feea59d6..042bccb5 100644
ch.pipeline().addLast( BOSS_HANDLER, new HandlerBoss() ); ch.pipeline().addLast( BOSS_HANDLER, new HandlerBoss() );
-- --
2.20.1 2.21.0

10
BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From 99262e2285605ffe26c6a0e0df756c9ced6c3152 Mon Sep 17 00:00:00 2001 From f3291be33d3a2e2766ba43ce1da71dada0511a7a Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 14 Jan 2019 03:35:21 +0000 Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting Subject: [PATCH] Provide an option to disable entity metadata rewriting
@ -26,7 +26,7 @@ index f792426e..92070fcf 100644
+ boolean isDisableEntityMetadataRewrite(); + boolean isDisableEntityMetadataRewrite();
} }
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
index ea06f3ba..d9ea75ca 100644 index 04b21d0f..42b17a69 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java --- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java +++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -60,6 +60,8 @@ public class WaterfallConfiguration extends Configuration { @@ -60,6 +60,8 @@ public class WaterfallConfiguration extends Configuration {
@ -48,7 +48,7 @@ index ea06f3ba..d9ea75ca 100644
@Override @Override
@@ -109,4 +112,9 @@ public class WaterfallConfiguration extends Configuration { @@ -109,4 +112,9 @@ public class WaterfallConfiguration extends Configuration {
public boolean isAllowEmptyPackets() { public boolean isAllowEmptyPackets() {
return false; return allowEmptyPackets;
} }
+ +
+ @Override + @Override
@ -152,7 +152,7 @@ index 9c872a1c..8a524a64 100644
+ // Waterfall end + // Waterfall end
} }
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 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 9737a8d2..8469e665 100644 index f635a7e4..c1dc6489 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -590,6 +590,7 @@ public class DownstreamBridge extends PacketHandler @@ -590,6 +590,7 @@ public class DownstreamBridge extends PacketHandler
@ -209,5 +209,5 @@ index 00000000..cb81d1dd
+// Waterfall end +// Waterfall end
\ No newline at end of file \ No newline at end of file
-- --
2.20.1 2.21.0