From ab24be476ccebb3a4ee5b6127a5eed99d3c23e15 Mon Sep 17 00:00:00 2001 From: nostalgic853 Date: Sun, 6 Nov 2022 13:43:09 +0800 Subject: [PATCH] Updated Upstream (Purpur) --- gradle.properties | 2 +- patches/server/0001-Rebrand.patch | 10 +++++----- patches/server/0006-Suki-Patches.patch | 6 +++--- .../server/0021-Skip-entity-move-if-no-movement.patch | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index f625f00..d436e24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = cc.keyimc.keyi version = 1.19.2-R0.1-SNAPSHOT -purpurCommit = fff2015d5255bff063d1d872e60898194cc8dde8 +purpurCommit = d43289ce14af5f0e1d8260f46ccb01db3fa2ed27 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 92de562..a3c7d1d 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index 2ee34f92e8a89b90448bbf710fdc0d5d6350e919..299ac3fab7543cb7ae0371ae80ea4786e6d37d8b 100644 +index 8ffc0d92ea29b95e5406ed81088ecf00e7679a97..96c012a57170fe1ec6954af7969b5c1371ea9ecf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -9,7 +9,7 @@ plugins { +@@ -7,7 +7,7 @@ plugins { } dependencies { @@ -17,7 +17,7 @@ index 2ee34f92e8a89b90448bbf710fdc0d5d6350e919..299ac3fab7543cb7ae0371ae80ea4786 // Pufferfish start implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { exclude("io.papermc.paper", "paper-api") -@@ -80,13 +80,13 @@ tasks.jar { +@@ -78,13 +78,13 @@ tasks.jar { manifest { val git = Git(rootProject.layout.projectDirectory.path) val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() @@ -166,7 +166,7 @@ index fba5dbdb7bcbb55400ef18342c9b54612972a718..005983d56b283e54e2cf450f1e9f985a private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f9508a26b2e764e752da3d2c9f43a9d7de19dd27..4f029b96bf8deee597dbb56974e4519a1422f96d 100644 +index 2491785f5edd782b74189bef33eeffe13288f3da..3a67aaa39daf1fb86938f53e129aadfb686583b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper @@ -192,7 +192,7 @@ index fb87620c742ff7912f5e8ccd2a7930dd605576d9..d779212cbb719a1d923a24823135c5d3 if (stream != null) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 5d71e3040df116a94df7efa83e61dc1766cc4a93..75f73042a72c6dde630ed106668fe2c60a8243f9 100644 +index ccca392a45cb05abb55ddd5c6c36e6f9c7a5d171..f02a183fa2fd359456063b55c6c087e802c54f7b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -244,7 +244,7 @@ public class PurpurConfig { diff --git a/patches/server/0006-Suki-Patches.patch b/patches/server/0006-Suki-Patches.patch index 09fde29..55dfc3c 100644 --- a/patches/server/0006-Suki-Patches.patch +++ b/patches/server/0006-Suki-Patches.patch @@ -106,10 +106,10 @@ index b2860114d52c52360e1e559d0c2c5ee4789dee97..8c09bdc0bd0af7ab9c5b3cad4067e1e0 @Override diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 141ea294d12411d58771ea1ad58383e84b6ba048..20763daf8921f78f8c017d3dbcafbd2c8527abcf 100644 +index 2a71c8e6901944af90c4ad4dfa39dba7fafc0126..2e79bc8218454d1714dc878b6f07d3ed289fed68 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java -@@ -355,7 +355,11 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -356,7 +356,11 @@ public class Connection extends SimpleChannelInboundHandler> { packet instanceof net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket || packet instanceof net.minecraft.network.protocol.game.ClientboundSetTitlesAnimationPacket || packet instanceof net.minecraft.network.protocol.game.ClientboundClearTitlesPacket || @@ -122,7 +122,7 @@ index 141ea294d12411d58771ea1ad58383e84b6ba048..20763daf8921f78f8c017d3dbcafbd2c } // Paper end } -@@ -406,7 +410,15 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -407,7 +411,15 @@ public class Connection extends SimpleChannelInboundHandler> { private void sendPacket(Packet packet, @Nullable PacketSendListener callbacks, Boolean flushConditional) { this.packetWrites.getAndIncrement(); // must be befeore using canFlush boolean effectiveFlush = flushConditional == null ? this.canFlush : flushConditional.booleanValue(); diff --git a/patches/server/0021-Skip-entity-move-if-no-movement.patch b/patches/server/0021-Skip-entity-move-if-no-movement.patch index aa2ac6f..d59f08a 100644 --- a/patches/server/0021-Skip-entity-move-if-no-movement.patch +++ b/patches/server/0021-Skip-entity-move-if-no-movement.patch @@ -9,7 +9,7 @@ Original code by RelativityMC, licensed under MIT You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9b99a2ebdc642731ee054e4e7e8b4631e0f8c4b2..c03ebb7709df712837720f4aae5771a65fa45ff3 100644 +index a12f4725fbe00e2ec55b8fb0bfd167c972566bed..c84fae75546f93c797b4e45234e39475737750c6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -399,6 +399,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -34,7 +34,7 @@ index 9b99a2ebdc642731ee054e4e7e8b4631e0f8c4b2..c03ebb7709df712837720f4aae5771a6 // Paper start - detailed watchdog information io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main"); synchronized (this.posLock) { -@@ -3816,6 +3824,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3820,6 +3828,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public final void setBoundingBox(AABB boundingBox) {