From b135148dfc007e9e116ff9822c65d491ace2157c Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Sun, 27 Oct 2024 13:54:08 -0400 Subject: [PATCH 1/3] fix a typo --- .../proxy/protocol/netty/MinecraftVarintFrameDecoder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java index 7bf7563ea2..84f35381ee 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java @@ -46,6 +46,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) // skip any runs of 0x00 we might find int packetStart = in.forEachByte(FIND_NON_NUL); if (packetStart == -1) { + in.clear(); return; } in.readerIndex(packetStart); From f2d6e143ae872f7da83d69a97acca0412923c7f6 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Sun, 27 Oct 2024 14:10:33 -0400 Subject: [PATCH 2/3] Update several dependencies --- gradle/libs.versions.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 510c4d62a8..58e8e11bf3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,8 +2,8 @@ configurate3 = "3.7.3" configurate4 = "4.1.2" flare = "2.0.1" -log4j = "2.22.1" -netty = "4.1.106.Final" +log4j = "2.24.1" +netty = "4.1.114.Final" [plugins] indra-publishing = "net.kyori.indra.publishing:2.0.6" @@ -18,7 +18,7 @@ auto-service = "com.google.auto.service:auto-service:1.0.1" auto-service-annotations = "com.google.auto.service:auto-service-annotations:1.0.1" brigadier = "com.velocitypowered:velocity-brigadier:1.0.0-SNAPSHOT" bstats = "org.bstats:bstats-base:3.0.2" -caffeine = "com.github.ben-manes.caffeine:caffeine:3.1.5" +caffeine = "com.github.ben-manes.caffeine:caffeine:3.1.8" checker-qual = "org.checkerframework:checker-qual:3.42.0" checkstyle = "com.puppycrawl.tools:checkstyle:10.9.3" completablefutures = "com.spotify:completable-futures:0.3.6" @@ -28,15 +28,15 @@ configurate3-gson = { module = "org.spongepowered:configurate-gson", version.ref configurate4-hocon = { module = "org.spongepowered:configurate-hocon", version.ref = "configurate4" } configurate4-yaml = { module = "org.spongepowered:configurate-yaml", version.ref = "configurate4" } configurate4-gson = { module = "org.spongepowered:configurate-gson", version.ref = "configurate4" } -disruptor = "com.lmax:disruptor:3.4.4" -fastutil = "it.unimi.dsi:fastutil:8.5.12" +disruptor = "com.lmax:disruptor:4.0.0" +fastutil = "it.unimi.dsi:fastutil:8.5.15" flare-core = { module = "space.vectrix.flare:flare", version.ref = "flare" } flare-fastutil = { module = "space.vectrix.flare:flare-fastutil", version.ref = "flare" } -jline = "org.jline:jline-terminal-jansi:3.23.0" +jline = "org.jline:jline-terminal-jansi:3.27.1" jopt = "net.sf.jopt-simple:jopt-simple:5.0.4" junit = "org.junit.jupiter:junit-jupiter:5.10.2" jspecify = "org.jspecify:jspecify:0.3.0" -kyori-ansi = "net.kyori:ansi:1.0.3" +kyori-ansi = "net.kyori:ansi:1.1.0" guava = "com.google.guava:guava:25.1-jre" gson = "com.google.code.gson:gson:2.10.1" guice = "com.google.inject:guice:6.0.0" From dc40e160d7dbbf63c448ca0fd6b2788d206f22eb Mon Sep 17 00:00:00 2001 From: Aaron <71191102+RealBauHD@users.noreply.github.com> Date: Sun, 27 Oct 2024 19:27:09 +0100 Subject: [PATCH 3/3] replace old velocitypowered.com links (#1399) * replace old links * content to 'PaperMC', cause its probably the best --- .github/ISSUE_TEMPLATE/bug-report.yml | 2 +- .../proxy/command/builtin/VelocityCommand.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 82cada2b6c..ec81079b61 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -44,7 +44,7 @@ body: ``` [17:44:10 INFO]: Velocity 3.3.0-SNAPSHOT (git-9d25d309-b400) [17:44:10 INFO]: Copyright 2018-2023 Velocity Contributors. Velocity is licensed under the terms of the GNU General Public License v3. - [17:44:10 INFO]: velocitypowered.com - GitHub + [17:44:10 INFO]: PaperMC - GitHub ``` validations: diff --git a/proxy/src/main/java/com/velocitypowered/proxy/command/builtin/VelocityCommand.java b/proxy/src/main/java/com/velocitypowered/proxy/command/builtin/VelocityCommand.java index 79ac41e74e..85bf2061bd 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/command/builtin/VelocityCommand.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/command/builtin/VelocityCommand.java @@ -174,10 +174,10 @@ public int run(final CommandContext context) { if (version.getName().equals("Velocity")) { final TextComponent embellishment = Component.text() .append(Component.text() - .content("velocitypowered.com") + .content("PaperMC") .color(NamedTextColor.GREEN) .clickEvent( - ClickEvent.openUrl("https://velocitypowered.com")) + ClickEvent.openUrl("https://papermc.io/software/velocity")) .build()) .append(Component.text(" - ")) .append(Component.text()