From 084fc5d327303775ce37a3fc397fd9c91398d88e Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Wed, 12 May 2021 16:01:46 +0200
Subject: [PATCH] 21w19a, update to Gradle 7.0.1

---
 build.gradle.kts                                   |  2 +-
 .../protocol1_16_4to1_17/Protocol1_16_4To1_17.java | 14 ++++++++++++++
 gradle/libs.versions.toml                          |  2 +-
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f1fd1044..c7a49689 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.0.0-21w18a"
+    version = "4.0.0-21w19a"
     description = "Allow older clients to join newer server versions."
 }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
index 6be4f816..fe04dccf 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java
@@ -24,6 +24,7 @@ import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.packets.BlockItemPackets1_17;
 import com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.packets.EntityPackets1_17;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.libs.fastutil.ints.IntArrayList;
@@ -173,6 +174,19 @@ public class Protocol1_16_4To1_17 extends BackwardsProtocol<ClientboundPackets1_
             }
         });
 
+        registerClientbound(ClientboundPackets1_17.PING, null, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(wrapper -> {
+                    wrapper.cancel();
+
+                    // Plugins expecting a real response will have to handle this accordingly themselves
+                    PacketWrapper pongPacket = wrapper.create(ServerboundPackets1_17.PONG);
+                    pongPacket.sendToServer(Protocol1_16_4To1_17.class);
+                });
+            }
+        });
+
         registerServerbound(ServerboundPackets1_16_2.CLIENT_SETTINGS, new PacketRemapper() {
             @Override
             public void registerMap() {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cfc54659..af43ed05 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ metadata.format.version = "1.0"
 [versions]
 
 # ViaVersion
-viaver = "4.0.0-21w18a"
+viaver = "4.0.0-21w19a"
 
 # Common provided
 netty = "4.0.20.Final"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643e..e5338d37 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists