Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-19 14:59:32 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2022-11-13 17:03:24 +08:00
parent f5e7e0496c
commit 9321864717
10 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@@ -1,7 +1,7 @@
plugins {
java
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.3.8"
id("io.papermc.paperweight.patcher") version "1.3.9"
}
repositories {
@@ -12,7 +12,7 @@ repositories {
}
dependencies {
remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
decompiler("net.minecraftforge:forgeflower:1.5.605.7")
paperclip("io.papermc:paperclip:3.0.2")
}

2
gradle.properties
View File

@@ -4,4 +4,4 @@ version=1.19.2-R0.1-SNAPSHOT
mcVersion=1.19.2
packageVersion=1_19_R1
org.gradle.jvmargs=-Xmx2G
paperRef=3dcfec4499ce2ab3d8c775c7795a6283f8647242
paperRef=e22dacf4d2d39cb9d82b127953f9ad24d3e0f695

12
patches/server/0001-Build-changes.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 44e0f265432487fe5c3c00c5245041298ade16a0..23eb2a0803162d4adafddbb2c649401960575741 100644
index b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..abca7e9e3b26b0f4086b6ace2f35b87d58393575 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,8 +9,12 @@ plugins {
@@ -7,8 +7,12 @@ plugins {
}
dependencies {
@@ -23,7 +23,7 @@ index 44e0f265432487fe5c3c00c5245041298ade16a0..23eb2a0803162d4adafddbb2c6494019
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -58,13 +62,13 @@ tasks.jar {
@@ -56,13 +60,13 @@ tasks.jar {
manifest {
val git = Git(rootProject.layout.projectDirectory.path)
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
@@ -39,7 +39,7 @@ index 44e0f265432487fe5c3c00c5245041298ade16a0..23eb2a0803162d4adafddbb2c6494019
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -163,7 +167,7 @@ fun TaskContainer.registerRunTask(
@@ -134,7 +138,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -71,7 +71,7 @@ index 7b1843e16745ca8db2244e17490d291401f22679..0ac8bcb0a4b7d1da3d0e016617db7a81
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ce81ba5345c8d2fde8a2534b9673275c7e86af8b..5d3b64419e2394d1e60c4bbcbad539354cc7fc5d 100644
index 6dc6c3bccb4ba34268a87b0754c87eb1e0df4135..80d0af51faadaca638fbbd4bb98950b73473b925 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -84,7 +84,7 @@ index ce81ba5345c8d2fde8a2534b9673275c7e86af8b..5d3b64419e2394d1e60c4bbcbad53935
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 111f8276f26350a5c62a7b8577b4598978b5355d..0880f7b55d1ce9ff42206fbb2f201500ec5e6ea5 100644
index 4212568bf8de6988c71f43d3e2152fa0fe51d0d7..54f25b3141779dc1b63674c9ecd923997f2849a1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper

6
patches/server/0009-Allow-vanilla-properties-def.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow vanilla properties def
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 4a8286c78a9a5e305b19cc5d316bc73a78e49b4d..1c90286f238bf7d1df291f079a57196dce98dd01 100644
index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..c04b68b679f8fde29bb246b5fd0262e0bd1d7356 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -135,12 +135,12 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -21,6 +21,6 @@ index 4a8286c78a9a5e305b19cc5d316bc73a78e49b4d..1c90286f238bf7d1df291f079a57196d
@Comment("This setting controls if players should be able to create headless pistons.")
- public boolean allowHeadlessPistons = false;
+ public boolean allowHeadlessPistons = true;
@Comment("This setting controls if grindstones should be able to output overstacked items (such as cursed books).")
public boolean allowGrindstoneOverstacking = false;
}
public Commands commands;

10
patches/server/0010-Add-fakeplayer-support.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add fakeplayer support
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2f5ed2d41e9cd768b88b4aab974200e047f916ed..3775a75a54807e50eded612f26fec5ad0229fbca 100644
index b9af91e89c98d69e0708324f246e2879f476be1a..7516fb266706ddf0935cb622ea11ab096428cd41 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -120,6 +120,7 @@ import net.minecraft.util.profiling.metrics.profiling.ServerMetricsSamplersProvi
@@ -57,7 +57,7 @@ index a0c19503aabab5378d672a30163d35a5ba05b6c1..8873e12cbd3d6f9071efedb35ea3c69c
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
boolean flag1 = advancementprogress.isDone();
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 961d25bbf868438bf5e5257bad745c8208a01171..ea0902fe8b3cabf4187da976d562527bfc498123 100644
index 3b122f521c166253f20d233c0fcebdede6660be5..7be9477acdce3ee271134335568603ef274a88ca 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -174,6 +174,7 @@ import org.bukkit.event.player.PlayerPortalEvent;
@@ -83,7 +83,7 @@ index 961d25bbf868438bf5e5257bad745c8208a01171..ea0902fe8b3cabf4187da976d562527b
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 06eda955f96b5fe2d08ed0d39229c7a6ebb88931..68233891ccb0f9389e22561421e743aa5c3ba02b 100644
index 3be9352ae9b0b84acf07064b45562ceffd30391b..a2af1dae2cf9176bbfd33b198f75584662027074 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -76,6 +76,7 @@ import net.minecraft.server.ServerScoreboard;
@@ -130,10 +130,10 @@ index 06eda955f96b5fe2d08ed0d39229c7a6ebb88931..68233891ccb0f9389e22561421e743aa
if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 9b131f0a827413e9f5d6d0f7491c5481576cb8b1..e2305caf0b3ce21810a31e05c943a6d859870bd5 100644
index 55bdf4f91be6750dcfd0589c566fbefde4512a1e..2d255f927422109fe86da5087f7539b267a7ad61 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1291,7 +1291,7 @@ public abstract class Player extends LivingEntity {
@@ -1300,7 +1300,7 @@ public abstract class Player extends LivingEntity {
boolean flag3 = false;
double d0 = (double) (this.walkDist - this.walkDistO);

6
patches/server/0020-Dont-send-useless-entity-packets.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Dont send useless entity packets
This patch is Powered by Purpur(https://github.com/PurpurMC/Purpur)
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 3b144c820531122eb37d41be06c182b5f5dc0724..8eb4a062489b42b26076d5f3bdfbff368c1a199b 100644
index 2358bb1788cfb902bac9b3b7588954af2d2cd823..52a1fc859c4b494bcac9f6f6f971e477a3acbf85 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -165,20 +165,29 @@ public class ServerEntity {
@@ -166,20 +166,29 @@ public class ServerEntity {
boolean flag4 = k < -32768L || k > 32767L || l < -32768L || l > 32767L || i1 < -32768L || i1 > 32767L;
if (!flag4 && this.teleportDelay <= 400 && !this.wasRiding && this.wasOnGround == this.entity.isOnGround() && !(io.papermc.paper.configuration.GlobalConfiguration.get().collisions.sendFullPosForHardCollidingEntities && this.entity.hardCollides())) { // Paper - send full pos for hard colliding entities to prevent collision problems due to desync
@@ -46,7 +46,7 @@ index 3b144c820531122eb37d41be06c182b5f5dc0724..8eb4a062489b42b26076d5f3bdfbff36
}
if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
@@ -245,6 +254,21 @@ public class ServerEntity {
@@ -246,6 +255,21 @@ public class ServerEntity {
}

8
patches/server/0021-Multithreaded-Tracker.patch
View File

@@ -31,7 +31,7 @@ index f597d65d56964297eeeed6c7e77703764178fee0..a584f2d0829db0bb220b2934ae2934da
public ChunkHolder.FullChunkStatus status;
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index a43902fbc160d39bcfd3937b251c9e827ec0214f..7179137194040ee29f05227aa67bd5f1ec5b4045 100644
index 322d7e06d014d7f69cd990c096e056074fa7066f..8d14c04e1cbc5de312bf47e4851e79f4176427da 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1236,8 +1236,38 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -129,10 +129,10 @@ index ca42c2642a729b90d22b968af7258f3aee72e14b..464678e973513b5c9e0cf0910cac1b3b
public boolean visible = true;
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 8eb4a062489b42b26076d5f3bdfbff368c1a199b..441edf3dbd34c8d15b7b1ba02c92e8f10ccda59e 100644
index 52a1fc859c4b494bcac9f6f6f971e477a3acbf85..52cfe588f49444f198db2e40c3073bc6583ca142 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -271,14 +271,18 @@ public class ServerEntity {
@@ -272,14 +272,18 @@ public class ServerEntity {
public void removePairing(ServerPlayer player) {
this.entity.stopSeenByPlayer(player);
@@ -153,7 +153,7 @@ index 8eb4a062489b42b26076d5f3bdfbff368c1a199b..441edf3dbd34c8d15b7b1ba02c92e8f1
this.entity.startSeenByPlayer(player);
}
@@ -384,19 +388,28 @@ public class ServerEntity {
@@ -385,19 +389,28 @@ public class ServerEntity {
SynchedEntityData datawatcher = this.entity.getEntityData();
if (datawatcher.isDirty()) {

17
patches/server/0023-Optimize-entity-coordinate-key.patch
View File

@@ -5,11 +5,11 @@ Subject: [PATCH] Optimize entity coordinate key
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
index 13082cd8de1a79a3b2fac6055bdaa163dbc7897b..cf70c8cb1ad5da3a8681760f69f4250c5627600d 100644
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -208,7 +208,13 @@ public final class MCUtil {
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
index e63dc33250831428c2cef34e02238600231fb815..8a0ade1d64d1028f38b756e94f51674f48296551 100644
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
@@ -209,7 +209,13 @@ public final class MCUtil {
}
public static long getCoordinateKey(final Entity entity) {
@@ -25,7 +25,7 @@ index 13082cd8de1a79a3b2fac6055bdaa163dbc7897b..cf70c8cb1ad5da3a8681760f69f4250c
public static long getCoordinateKey(final ChunkPos pair) {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e0cc8171151f9db0d4b29980f097f81cacfe9718..a20930d2c09005a210e5242401cfb2e6c6082a01 100644
index 54c730dca6ea06d2dcde19d9c431ef7c0fffff29..ea287169df654c361a2b27148907578b634c1bba 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -38,10 +38,10 @@ index e0cc8171151f9db0d4b29980f097f81cacfe9718..a20930d2c09005a210e5242401cfb2e6
private Vec3 deltaMovement;
private float yRot;
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 3907bbfae224be1467bead2e13a7eace7e75e579..c234e6de433fa83055edc87c02e1d935cf3860df 100644
index 3907bbfae224be1467bead2e13a7eace7e75e579..578bbec4431366e55a615ccbb5e7c8d0a50d668b 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -256,6 +256,11 @@ public final class LeavesConfig {
@@ -256,6 +256,12 @@ public final class LeavesConfig {
fixPaper6045 = getBoolean("settings.performance.fix.fix-paper-6045", fixPaper6045);
}
@@ -49,6 +49,7 @@ index 3907bbfae224be1467bead2e13a7eace7e75e579..c234e6de433fa83055edc87c02e1d935
+ private static void optimizeEntityCoordinateKey() {
+ optimizeEntityCoordinateKey = getBoolean("settings.performance.optimize-entity-coordinate-key", optimizeEntityCoordinateKey);
+ }
+
+
public static final class WorldConfig {

7
patches/server/0024-Optimize-suffocation.patch
View File

@@ -35,10 +35,10 @@ index 476afe131aa60d91a2d43fd04c55ab591b03337b..c23e0c6b740878e035a1b84a31bfaa3a
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index c234e6de433fa83055edc87c02e1d935cf3860df..64fc662bcf102df1fd971e9bc72b96ebfe3cda32 100644
index 578bbec4431366e55a615ccbb5e7c8d0a50d668b..64fc662bcf102df1fd971e9bc72b96ebfe3cda32 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -261,6 +261,11 @@ public final class LeavesConfig {
@@ -261,6 +261,10 @@ public final class LeavesConfig {
optimizeEntityCoordinateKey = getBoolean("settings.performance.optimize-entity-coordinate-key", optimizeEntityCoordinateKey);
}
@@ -46,7 +46,6 @@ index c234e6de433fa83055edc87c02e1d935cf3860df..64fc662bcf102df1fd971e9bc72b96eb
+ private static void enableSuffocationOptimization() {
+ enableSuffocationOptimization = getBoolean("settings.performance.enable-suffocation-optimization", enableSuffocationOptimization);
+ }
+
public static final class WorldConfig {
public final String worldName;

6
patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5e85ecd3fc64f92e3ca65d127930ff195cd0949c..ed7b0a7465e06208b7a36d7381f8cfe9ec68d550 100644
index 38a034d908bdd19af3eee8654d7d1cea4cb1dca6..9ae5569d96a3f40e434040ce7e9b75662c50ff1f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4014,16 +4014,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4018,16 +4018,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -35,7 +35,7 @@ index 5e85ecd3fc64f92e3ca65d127930ff195cd0949c..ed7b0a7465e06208b7a36d7381f8cfe9
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4031,38 +4033,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4035,38 +4037,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();