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-25 16:39:17 +08:00
parent c9ca5566ea
commit 9b1e3cceef
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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.9"
id("io.papermc.paperweight.patcher") version "1.3.11"
}
repositories {

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=215111213b878f2d837032632c83fabe09000bc2
paperRef=d98c370fb5101c6e61d7a62e8430d2f7bf8c5f01

4
patches/server/0006-Fix-trading-with-the-void.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index f1a1c58fd70610c7fe29d5890cdf161346f34cb9..5e2e22b66a63d1df420d4f39244abfccbe108900 100644
index 79aa3374fd47cd57d2e0810bb5afebbdb38a1892..bd3e6044de5a63c0372b4ed207feb5bb58de0d98 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2618,11 +2618,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2619,11 +2619,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot end
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message

4
patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 0318c9483a4d96eb39ff4df9054a9e6398186bc3..476afe131aa60d91a2d43fd04c55ab591b03337b 100644
index fb6fd9357f665a001238384475a9b674715700ba..99cb69cc6358dfaeeece22602700e394802ad43c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1533,12 +1533,12 @@ public abstract class LivingEntity extends Entity {
@@ -23,7 +23,7 @@ index 0318c9483a4d96eb39ff4df9054a9e6398186bc3..476afe131aa60d91a2d43fd04c55ab59
itemstack1.shrink(1);
}
if (itemstack != null && this instanceof ServerPlayer) {
@@ -4378,3 +4378,4 @@ public abstract class LivingEntity extends Entity {
@@ -4399,3 +4399,4 @@ public abstract class LivingEntity extends Entity {
}
}

6
patches/server/0025-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index c23e0c6b740878e035a1b84a31bfaa3a5f469007..11b8d5571ef0224424562407abcaa76aa564e459 100644
index 040ce7d50bb6aa87ae86ac35a06a9af241fcab03..e5fa2fde9ec53eac1e41bd0ded5f93b9e06258c8 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3595,7 +3595,13 @@ public abstract class LivingEntity extends Entity {
@@ -3616,7 +3616,13 @@ public abstract class LivingEntity extends Entity {
Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
// Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
@@ -46,7 +46,7 @@ index d1eefa6ef3e9abfe7af4d8310aa64465fa2d5463..c91735828dc99af0b880a5a105025b42
default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
// Paper start - Prevent raytrace from loading chunks
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index a69b428d5465b2e434bfd21cd935997c1871bbb6..22838524727a1755739d056b726cf8321b7b4883 100644
index 4d880d9b56dc39a298e047cda3f2a31adef45cbc..daa3eb43727bbf8aefd2c69e711aa1709fba7eba 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -410,6 +410,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

6
patches/server/0027-Move-ThreadUnsafeRandom-Initialization.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Move ThreadUnsafeRandom Initialization
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 5e2e22b66a63d1df420d4f39244abfccbe108900..449b3aaf00a13006e836e672b9c4d6d72b0274a7 100644
index bd3e6044de5a63c0372b4ed207feb5bb58de0d98..a8c7ecbd7191fcdb2e012cafcf7a0ac63db75055 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -794,7 +794,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -795,7 +795,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
// Paper start - optimise random block ticking
private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
@@ -19,7 +19,7 @@ index 5e2e22b66a63d1df420d4f39244abfccbe108900..449b3aaf00a13006e836e672b9c4d6d7
public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 22838524727a1755739d056b726cf8321b7b4883..2e19e8cf66063a789770531fe399d81ebb20cfda 100644
index daa3eb43727bbf8aefd2c69e711aa1709fba7eba..776aeb1ea8bb76d098452c72caf8d941c99f0f60 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -272,6 +272,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

12
patches/server/0028-Optimize-random-calls-in-chunk-ticking.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize random calls in chunk ticking
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 7d7501e85874e60263d5462dba02a4b3a79f68cb..86670ac9be2eca8b68fd0bc5caa3ad54b1b48298 100644
index b9c1d62b13465db6d435d1cda72ca759d8f0d22d..70b7ef1309db9e61cab5cf9601fc9fc374265b11 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -707,6 +707,11 @@ public class ServerChunkCache extends ChunkSource {
@@ -22,10 +22,10 @@ index 7d7501e85874e60263d5462dba02a4b3a79f68cb..86670ac9be2eca8b68fd0bc5caa3ad54
boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 449b3aaf00a13006e836e672b9c4d6d72b0274a7..866ead7a0b53fe9bd1442c18f0050e60332d505d 100644
index a8c7ecbd7191fcdb2e012cafcf7a0ac63db75055..d59cab4f6a243d9f2448cc7b396d7a4cf9378684 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -797,6 +797,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -798,6 +798,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
// private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(this.random.nextLong()); // Leaves - moved to super
// Paper end
@@ -39,7 +39,7 @@ index 449b3aaf00a13006e836e672b9c4d6d72b0274a7..866ead7a0b53fe9bd1442c18f0050e60
public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
ChunkPos chunkcoordintpair = chunk.getPos();
boolean flag = this.isRaining();
@@ -807,7 +814,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -808,7 +815,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
gameprofilerfiller.push("thunder");
final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
@@ -48,7 +48,7 @@ index 449b3aaf00a13006e836e672b9c4d6d72b0274a7..866ead7a0b53fe9bd1442c18f0050e60
blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper
if (this.isRainingAt(blockposition)) {
DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
@@ -831,7 +838,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -832,7 +839,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
gameprofilerfiller.popPush("iceandsnow");
@@ -58,7 +58,7 @@ index 449b3aaf00a13006e836e672b9c4d6d72b0274a7..866ead7a0b53fe9bd1442c18f0050e60
this.getRandomBlockPosition(j, 0, k, 15, blockposition);
int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 258d00692fa50e0932747a7a2f0ddae5ab659040..8ea31fbe83a9cfb3a54274896decb72207e14202 100644
index 5e54cf312160e537d2fe6e6fedc618160359330e..c75ddded71d32bc8e9d219a8acc52482f776c526 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -88,6 +88,18 @@ public class LevelChunk extends ChunkAccess {

4
patches/server/0036-Remove-lambda-from-ticking-guard.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Remove lambda from ticking guard
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 866ead7a0b53fe9bd1442c18f0050e60332d505d..7c17c83810d85ead2b9db7b0716ea447bba565bd 100644
index d59cab4f6a243d9f2448cc7b396d7a4cf9378684..3fa46ef92fc7be51e61361b1918162c563022094 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -727,7 +727,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -728,7 +728,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
gameprofilerfiller.push("tick");