Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@08c0b48 [ci skip] update paperweight to 1.5.7 & re-enable filterpatches (#9799)
PaperMC/Paper@29a0209 Properly check water block when random ticking ice (#9804)
This commit is contained in:
granny
2023-10-06 19:37:50 -07:00
parent fd01882d1f
commit be959650a5
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0266-Remove-Mojang-Profiler.patch
View File

@@ -564,7 +564,7 @@ index 9dc3dec2bdf2e503fe10364dd4bb5cf662288260..4ab448842dcbf7f0f45d4443d0bb007e
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 613f1ca115441f6a90830e7be8262493105ddf2f..ef654df11d946cb9560fa05dae86ba727832106e 100644
index b1f5ccd309f84f7b53d16ad6241bb4cb1bdd0726..db3c7b914a301005ba7fa92c7c042777b2fbda72 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -823,12 +823,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -718,7 +718,7 @@ index 613f1ca115441f6a90830e7be8262493105ddf2f..ef654df11d946cb9560fa05dae86ba72
}
private void tickIceAndSnow(boolean raining, BlockPos.MutableBlockPos blockposition1, final LevelChunk chunk) { // Paper - optimise chunk ticking
@@ -1441,19 +1440,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1442,19 +1441,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
//try { // Purpur
// Paper end - timings
entity.setOldPosAndRot();
@@ -743,7 +743,7 @@ index 613f1ca115441f6a90830e7be8262493105ddf2f..ef654df11d946cb9560fa05dae86ba72
//} finally { timer.stopTiming(); } // Paper - timings // Purpur
Iterator iterator = entity.getPassengers().iterator();
@@ -1482,12 +1481,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1483,12 +1482,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Paper end
passenger.setOldPosAndRot();
++passenger.tickCount;
@@ -760,7 +760,7 @@ index 613f1ca115441f6a90830e7be8262493105ddf2f..ef654df11d946cb9560fa05dae86ba72
// Paper start - EAR 2
if (isActive) {
passenger.rideTick();
@@ -1499,7 +1498,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1500,7 +1499,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
vehicle.positionRider(passenger);
}
// Paper end - EAR 2
@@ -1155,7 +1155,7 @@ index 28cac00d496cc6e37648dbe96ba4aea2b834cedd..6e0331818ef68fa355e3c27dc3e362b8
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 9ca3a8df8d4e0cd733c489c930b563888fb01ffa..a9b87083623050cf9b0a5311f0f687e0ada73137 100644
index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c610016ae7d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -411,7 +411,7 @@ public abstract class LivingEntity extends Entity implements Attackable {