Skip to content

Commit

Permalink
Update upstream (#19)
Browse files Browse the repository at this point in the history
* update upstream

* update gradle wrapper

* update upstream
  • Loading branch information
TrainmasterHD authored Jun 15, 2024
1 parent 0bbc80a commit b938dc7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group=net.gommehd.cheetah
version=1.20.6-R0.1-SNAPSHOT

mcVersion=1.20.6
paperRef=9d6f2cced75c1a433c508ab531a61872bce73854
paperRef=79e2cb620ef03539390d97940824b38b707918f5

org.gradle.caching=true
org.gradle.parallel=true
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0008-do-not-suppress-protocol-errors.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] do not suppress protocol errors


diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
index 02833deaa2bb7e5abc655bc1bdbe15c4b3ac7119..a45f3a192ba7505d313c30514fbf48623f6f7f4b 100644
index f40420a6841f03983b0837e177ea2ae7c3a37ca1..d0b6b432f0965797a67d8912487aa52836360d5d 100644
--- a/src/main/java/net/minecraft/network/Connection.java
+++ b/src/main/java/net/minecraft/network/Connection.java
@@ -213,7 +213,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
Expand All @@ -14,6 +14,6 @@ index 02833deaa2bb7e5abc655bc1bdbe15c4b3ac7119..a45f3a192ba7505d313c30514fbf4862
if (flag) {
- Connection.LOGGER.debug("Failed to sent packet", throwable);
+ Connection.LOGGER.warn("Failed to send to " + player.getName() + " packet", throwable); // Cheetah - change log level to warn
if (this.getSending() == PacketFlow.CLIENTBOUND) {
boolean doesDisconnectExist = this.packetListener.protocol() != ConnectionProtocol.STATUS && this.packetListener.protocol() != ConnectionProtocol.HANDSHAKING; // Paper
if (this.getSending() == PacketFlow.CLIENTBOUND && doesDisconnectExist) { // Paper
Packet<?> packet = this.sendLoginDisconnect ? new ClientboundLoginDisconnectPacket(ichatmutablecomponent) : new ClientboundDisconnectPacket(ichatmutablecomponent);

0 comments on commit b938dc7

Please sign in to comment.