multiple fixes

fixes #49 #48 #47 #40
yesdog · Jul 31, 2019 · d45b26e · d45b26e
1 parent 4eeb541
commit d45b26e
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 19 deletions.
diff --git a/BungeeCord-Patches/0057-Waterdog-PE-additions.patch b/BungeeCord-Patches/0057-Waterdog-PE-additions.patch
@@ -1,4 +1,4 @@
-From 81c87c895c5523a6c655d39554c6c33ddb993894 Mon Sep 17 00:00:00 2001
+From c21d4ac7c1b856dd3abade656b438d34b18965fd Mon Sep 17 00:00:00 2001
 From: Colin Godsey <crgodsey@gmail.com>
 Date: Tue, 16 Apr 2019 07:50:11 -0600
 Subject: [PATCH] Waterdog PE (additions)
@@ -19,10 +19,10 @@ index 00000000..73495872
 +}
 diff --git a/protocol/src/main/java/network/ycc/waterdog/pe/PEBlockRewrite.java b/protocol/src/main/java/network/ycc/waterdog/pe/PEBlockRewrite.java
 new file mode 100644
-index 00000000..3e39f0db
+index 00000000..fc483b0a
 --- /dev/null
 +++ b/protocol/src/main/java/network/ycc/waterdog/pe/PEBlockRewrite.java
-@@ -0,0 +1,174 @@
+@@ -0,0 +1,175 @@
 +package network.ycc.waterdog.pe;
 +
 +import io.netty.buffer.ByteBuf;
@@ -161,6 +161,7 @@ index 00000000..3e39f0db
 +            out.writeByte(subchunkVersion);
 +            switch (subchunkVersion) {
 +                case 0: //legacy block ids, no remap needed
++                case 4: //minet uses this format. what is it?
 +                    out.writeBytes(in);
 +                    return;
 +                case 8: //new form chunk, baked-in palette
@@ -259,10 +260,10 @@ index 00000000..9d983810
 +}
 diff --git a/protocol/src/main/java/network/ycc/waterdog/pe/PERawPacketData.java b/protocol/src/main/java/network/ycc/waterdog/pe/PERawPacketData.java
 new file mode 100644
-index 00000000..b23b3f95
+index 00000000..55ca27bd
 --- /dev/null
 +++ b/protocol/src/main/java/network/ycc/waterdog/pe/PERawPacketData.java
-@@ -0,0 +1,157 @@
+@@ -0,0 +1,176 @@
 +package network.ycc.waterdog.pe;
 +
 +import com.google.common.base.Preconditions;
@@ -419,6 +420,25 @@ index 00000000..b23b3f95
 +        channel.write(resourcePackData);
 +    }
 +
++    public static void injectRemoveAllEffects(Channel channel, long clientEntityId) {
++        for (int i = 0 ; i < 30 ; i++) {
++            injectRemoveEntityEffect(channel, clientEntityId, i);
++        }
++        channel.flush();
++    }
++
++    public static void injectRemoveEntityEffect(Channel channel, long entityId, int effectId) {
++        final ByteBuf removeEntityEffect = channel.alloc().ioBuffer();
++        DefinedPacket.writeVarInt(0x1C, removeEntityEffect); //PLAY_ENTITY_EFFECT
++        DefinedPacket.writeVarLong(entityId, removeEntityEffect);
++        removeEntityEffect.writeByte(3); //remove effect
++        DefinedPacket.writeSVarInt(effectId, removeEntityEffect);
++        DefinedPacket.writeSVarInt(0, removeEntityEffect); // unused
++        removeEntityEffect.writeBoolean(false); // unused
++        DefinedPacket.writeSVarInt(0, removeEntityEffect); // unused
++        channel.write(removeEntityEffect);
++    }
++
 +}
 diff --git a/protocol/src/main/java/network/ycc/waterdog/pe/PEResourcePackData.java b/protocol/src/main/java/network/ycc/waterdog/pe/PEResourcePackData.java
 new file mode 100644

diff --git a/BungeeCord-Patches/0058-Waterdog-PE-modifications.patch b/BungeeCord-Patches/0058-Waterdog-PE-modifications.patch
@@ -1,4 +1,4 @@
-From 070860da51ba9f63b39eca068af99239f8a16d66 Mon Sep 17 00:00:00 2001
+From d65f432c5e61bd261c13ecb54ed3ac66d135ad28 Mon Sep 17 00:00:00 2001
 From: Colin Godsey <crgodsey@gmail.com>
 Date: Tue, 16 Apr 2019 07:50:25 -0600
 Subject: [PATCH] Waterdog PE (modifications)
@@ -968,7 +968,7 @@ index dbb24e22..112c7229 100644
          if ( protocolVersion < ProtocolConstants.MINECRAFT_1_14 )
          {
 diff --git a/protocol/src/main/java/network/ycc/waterdog/pe/PEBlockRewrite.java b/protocol/src/main/java/network/ycc/waterdog/pe/PEBlockRewrite.java
-index 3e39f0db..827ce225 100644
+index fc483b0a..153e6782 100644
 --- a/protocol/src/main/java/network/ycc/waterdog/pe/PEBlockRewrite.java
 +++ b/protocol/src/main/java/network/ycc/waterdog/pe/PEBlockRewrite.java
 @@ -132,6 +132,7 @@ public abstract class PEBlockRewrite {
@@ -979,7 +979,7 @@ index 3e39f0db..827ce225 100644
              final int subchunkVersion = in.readUnsignedByte();
              out.writeByte(subchunkVersion);
              switch (subchunkVersion) {
-@@ -142,11 +143,17 @@ public abstract class PEBlockRewrite {
+@@ -143,11 +144,17 @@ public abstract class PEBlockRewrite {
                      rewriteV8ChunkSection(in, out);
                      break;
                  default: //unsupported
@@ -1015,7 +1015,7 @@ index dab227a1..12b52465 100644
 
      @Override
 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 6b3de71f..acea2dbb 100644
+index 6b3de71f..5f1742c6 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -248,6 +248,7 @@ public class BungeeCord extends ProxyServer
@@ -1034,7 +1034,7 @@ index 6b3de71f..acea2dbb 100644
              new ServerBootstrap()
                      .channel( PipelineUtils.getServerChannel() )
                      .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
-@@ -347,8 +349,23 @@ public class BungeeCord extends ProxyServer
+@@ -347,8 +349,24 @@ public class BungeeCord extends ProxyServer
                      .group( bossEventLoopGroup, workerEventLoopGroup )
                      .localAddress( info.getHost() )
                      .bind().addListener( listener );
@@ -1043,6 +1043,7 @@ index 6b3de71f..acea2dbb 100644
 +                new ServerBootstrap()
 +                    .channelFactory(() -> new network.ycc.raknet.server.channel.RakNetServerChannel(PipelineUtils.getDatagramChannel()))
 +                    //.option(UnixChannelOption.SO_REUSEPORT, true)
++                    .option(network.ycc.raknet.RakNet.MTU, 1500) //some servers hate large frames
 +                    .option(network.ycc.raknet.RakNet.MAX_CONNECTIONS, info.getMaxPlayers())
 +                    .option(network.ycc.raknet.RakNet.SERVER_ID, UUID.randomUUID().getMostSignificantBits())
 +                    .childAttr(PipelineUtils.LISTENER, info)
@@ -1059,7 +1060,7 @@ index 6b3de71f..acea2dbb 100644
              {
                  ChannelFutureListener bindListener = new ChannelFutureListener()
                  {
-@@ -644,7 +661,7 @@ public class BungeeCord extends ProxyServer
+@@ -644,7 +662,7 @@ public class BungeeCord extends ProxyServer
 
      public PluginMessage registerChannels(int protocolVersion)
      {
@@ -1068,7 +1069,7 @@ index 6b3de71f..acea2dbb 100644
          {
              return new PluginMessage( "minecraft:register", Util.format( Iterables.transform( pluginChannels, PluginMessage.MODERNISE ), "\00" ).getBytes( Charsets.UTF_8 ), false );
          }
-@@ -665,9 +682,9 @@ public class BungeeCord extends ProxyServer
+@@ -665,9 +683,9 @@ public class BungeeCord extends ProxyServer
      }
 
      @Override
@@ -1116,7 +1117,7 @@ index 4c0637b9..f2898669 100644
      public void addPlayer(ProxiedPlayer player)
      {
 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 72f487dc..67a5eefb 100644
+index 72f487dc..031acf7a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -52,6 +52,7 @@ import net.md_5.bungee.protocol.packet.SetCompression;
@@ -1249,7 +1250,7 @@ index 72f487dc..67a5eefb 100644
              if ( !user.isDisableEntityMetadataRewrite() ) { // Waterfall
              for ( Objective objective : serverScoreboard.getObjectives() )
              {
-@@ -320,6 +396,37 @@ public class ServerConnector extends PacketHandler
+@@ -320,6 +396,39 @@ public class ServerConnector extends PacketHandler
              }
              user.setDimension( login.getDimension() );
 
@@ -1281,6 +1282,8 @@ index 72f487dc..67a5eefb 100644
 +                entityIDs.clear();
 +
 +                user.unsafe().sendPacket( new network.ycc.waterdog.pe.packet.PEStopSoundPacket( "portal.travel", true ) );
++
++                network.ycc.waterdog.pe.PERawPacketData.injectRemoveAllEffects(user.getCh().getHandle(), user.getClientEntityId());
 +            }
 +            // Waterdog end
 +
@@ -1923,9 +1926,18 @@ index a66099fc..7287197c 100644
                  {
                      ProxyServer.getInstance().getLogger().log( Level.SEVERE, handler + " - encountered exception", cause );
 diff --git a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
-index ac99d02c..96dc06c9 100644
+index ac99d02c..4ef5d859 100644
 --- a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
 +++ b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
+@@ -69,7 +69,7 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
+         ByteBuf in = msg.content();
+         if ( in.readUnsignedByte() != 0xFE || in.readUnsignedByte() != 0xFD )
+         {
+-            bungee.getLogger().log( Level.WARNING, "Query - Incorrect magic!: {0}", msg.sender() );
++            //bungee.getLogger().log( Level.WARNING, "Query - Incorrect magic!: {0}", msg.sender() ); // Waterdog
+             return;
+         }
+
 @@ -100,12 +100,16 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
              }
 

diff --git a/BungeeCord-Patches/0064-Travertine-1.7.x-Protocol-Patch.patch b/BungeeCord-Patches/0064-Travertine-1.7.x-Protocol-Patch.patch
@@ -1,4 +1,4 @@
-From 1f8284d072feaec449aa5fe265c0cf779b6661ae Mon Sep 17 00:00:00 2001
+From 6ab033edeffc77fef00b08a499a2706086a943d0 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] Travertine 1.7.x Protocol Patch
@@ -1248,7 +1248,7 @@ index 85d386c0..7a80acac 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 acea2dbb..96c81601 100644
+index 5f1742c6..98bcb919 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -162,6 +162,14 @@ public class BungeeCord extends ProxyServer
@@ -1342,7 +1342,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 67a5eefb..54f7b4d2 100644
+index 031acf7a..dca3687f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf;
@@ -1387,7 +1387,7 @@ index 67a5eefb..54f7b4d2 100644
              }
              for ( Score score : serverScoreboard.getScores() )
              {
-@@ -531,6 +542,14 @@ public class ServerConnector extends PacketHandler
+@@ -533,6 +544,14 @@ public class ServerConnector extends PacketHandler
              {
                  this.handshakeHandler.handle( pluginMessage );