From b40a6bb08b8e37e8d63244ce825ffa82c32e7a7d Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 13 Jun 2023 00:10:07 -0700 Subject: [PATCH] 1.20.1 (#9333) --- README.md | 4 ++-- build.gradle.kts | 2 +- gradle.properties | 4 ++-- patches/api/Convert-project-to-Gradle.patch | 2 +- patches/server/Enderman.teleportRandomly.patch | 13 ------------- ...etwork-Manager-and-add-advanced-packet-sup.patch | 4 ++-- patches/server/Rewrite-chunk-system.patch | 4 ++-- patches/server/Setup-Gradle-project.patch | 2 +- work/BuildData | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 12 files changed, 15 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 95d0d66253..204ab5abcd 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ How To (Plugin Developers) io.papermc.paper paper-api - 1.20-R0.1-SNAPSHOT + 1.20.1-R0.1-SNAPSHOT provided ``` @@ -54,7 +54,7 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT") } java { diff --git a/build.gradle.kts b/build.gradle.kts index ef118f52f7..aa78c58d53 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -61,7 +61,7 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.20+build.1:mergedv2") + paramMappings("net.fabricmc:yarn:1.20.1+build.1:mergedv2") remapper("net.fabricmc:tiny-remapper:0.8.6:fat") decompiler("net.minecraftforge:forgeflower:2.0.627.2") spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6") diff --git a/gradle.properties b/gradle.properties index 5fb6c52862..469b0f4f33 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group=io.papermc.paper -version=1.20-R0.1-SNAPSHOT -mcVersion=1.20 +version=1.20.1-R0.1-SNAPSHOT +mcVersion=1.20.1 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch index cffc98f39d..884d4feac0 100644 --- a/patches/api/Convert-project-to-Gradle.patch +++ b/patches/api/Convert-project-to-Gradle.patch @@ -129,7 +129,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.spigotmc - spigot-api -- 1.20-R0.1-SNAPSHOT +- 1.20.1-R0.1-SNAPSHOT - jar - - Spigot-API diff --git a/patches/server/Enderman.teleportRandomly.patch b/patches/server/Enderman.teleportRandomly.patch index c363a76a25..401ce56230 100644 --- a/patches/server/Enderman.teleportRandomly.patch +++ b/patches/server/Enderman.teleportRandomly.patch @@ -5,19 +5,6 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. -diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -@@ -0,0 +0,0 @@ public class EnderMan extends Monster implements NeutralMob { - super.customServerAiStep(); - } - -- protected boolean teleport() { -+ public boolean teleport() { // Paper - protected->public - if (!this.level().isClientSide() && this.isAlive()) { - double d0 = this.getX() + (this.random.nextDouble() - 0.5D) * 64.0D; - double d1 = this.getY() + (double) (this.random.nextInt(64) - 32); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java diff --git a/patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch index 9c6d5cc03f..8816d972aa 100644 --- a/patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch +++ b/patches/server/Optimize-Network-Manager-and-add-advanced-packet-sup.patch @@ -269,8 +269,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.preparing = false; + clearPacketQueue(); // Paper // Spigot End - if (this.channel.isOpen()) { - this.channel.close(); // We can't wait as this may be called from an event loop. + if (this.channel == null) { + this.delayedDisconnect = disconnectReason; @@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler> { public void handleDisconnection() { if (this.channel != null && !this.channel.isOpen()) { diff --git a/patches/server/Rewrite-chunk-system.patch b/patches/server/Rewrite-chunk-system.patch index 2bd9250ba4..a487a0a95a 100644 --- a/patches/server/Rewrite-chunk-system.patch +++ b/patches/server/Rewrite-chunk-system.patch @@ -16723,8 +16723,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler> { - private int tickCount; - private boolean handlingFault; + @Nullable + private volatile Component delayedDisconnect; public String hostname = ""; // CraftBukkit - add field + // Paper start - add pending task queue + private final Queue pendingTasks = new java.util.concurrent.ConcurrentLinkedQueue<>(); diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index bf62a4483e..543a7f2459 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -182,7 +182,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - org.spigotmc - spigot - jar -- 1.20-R0.1-SNAPSHOT +- 1.20.1-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ - diff --git a/work/BuildData b/work/BuildData index 2881c6b6dd..faff587dcb 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 2881c6b6dd146126596342d4025d37a9a84a0b03 +Subproject commit faff587dcbe915bc565bf01f2d54c6af86039414 diff --git a/work/Bukkit b/work/Bukkit index 54e8ec7b47..f1dd65ed73 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 54e8ec7b47ec9a77e05d44d8898a0f247c8db046 +Subproject commit f1dd65ed73b7cca00527ff81d02ce4d27c456a37 diff --git a/work/CraftBukkit b/work/CraftBukkit index 6962456f98..9c5d600d13 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 6962456f98f6e5075c8bf6dff772f3c2464ae60e +Subproject commit 9c5d600d1395e9783a8369dc4227be2b05010107 diff --git a/work/Spigot b/work/Spigot index 7e2af8b2d6..bed8c61f55 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 7e2af8b2d6af54e66edd030abbf12359a8574e05 +Subproject commit bed8c61f55c6af77ae202c57842de8899bc8a59b