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

Final 1.20.6 Paper Upstream \o/

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

Paper Changes:
PaperMC/Paper@79e2cb6 Update upstream (Bukkit/CraftBukkit/Spigot) (#10875)
This commit is contained in:
granny
2024-06-13 16:27:38 -07:00
parent 72192634b0
commit cc56332b4e
37 changed files with 162 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0255-Remove-Mojang-Profiler.patch
View File

@@ -83,7 +83,7 @@ index e9775b4506909bee65a74964f0d5391a0513de1d..684f7f202305c09b1037c5d38a52a5ea
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f91739d3de41c20b352e159c7f4e12e6fdcab794..9e9537007a156dfbd41e53a93312ccb8be061a08 100644
index bf9e17659305680dc0262a0bc82246ec1f334fb9..e3a837166d1febfdf3dea9ab0a84c6e64ecd2d6e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -344,13 +344,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -474,7 +474,7 @@ index 2b8448ccb0e4750b722933b0b5de02d8f4f38788..345f143b0eeb77acb96e4bc716f3b237
public boolean hasWork() {
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 07b428ed7837642254b1edd55fd08a7beac7e303..476a04d87a61b021816d2970e86042bde32d95a2 100644
index e8906613073ba5dfe36f197c519953d391300ec4..25aff82dd74ee87f67632af48a2a8e7436fb1a84 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -259,14 +259,14 @@ public class ServerChunkCache extends ChunkSource {
@@ -517,7 +517,7 @@ index 07b428ed7837642254b1edd55fd08a7beac7e303..476a04d87a61b021816d2970e86042bd
- this.level.getProfiler().push("purge");
+ //this.level.getProfiler().push("purge"); // Purpur
//this.level.timings.doChunkMap.startTiming(); // Spigot // Purpur
if (this.level.tickRateManager().runsNormally() || !tickChunks) {
if (this.level.tickRateManager().runsNormally() || !tickChunks || this.level.spigotConfig.unloadFrozenChunks) { // Spigot
this.distanceManager.purgeStaleTickets();
}
this.runDistanceManagerUpdates();
@@ -1211,7 +1211,7 @@ index d42cf771b9cf77304d5174f374c56eb793fc2991..45e06ec0e975973edb4434f64ddfc0f6
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ceb420d3b9c5d3050b0d72ae612b8003d562202a..05644dd1872d8b558ed64f74fc8699d651cc893e 100644
index 36102a9bafde35d30a5cf78999a1999daa05b7e1..511e3de6de202ee96195194fd05f8a08b3fe73a1 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -423,7 +423,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1232,7 +1232,7 @@ index ceb420d3b9c5d3050b0d72ae612b8003d562202a..05644dd1872d8b558ed64f74fc8699d6
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3220,10 +3220,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3214,10 +3214,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1246,7 +1246,7 @@ index ceb420d3b9c5d3050b0d72ae612b8003d562202a..05644dd1872d8b558ed64f74fc8699d6
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3235,7 +3235,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3229,7 +3229,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1255,7 +1255,7 @@ index ceb420d3b9c5d3050b0d72ae612b8003d562202a..05644dd1872d8b558ed64f74fc8699d6
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3458,19 +3458,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3452,19 +3452,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1280,7 +1280,7 @@ index ceb420d3b9c5d3050b0d72ae612b8003d562202a..05644dd1872d8b558ed64f74fc8699d6
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3497,8 +3497,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3491,8 +3491,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1291,7 +1291,7 @@ index ceb420d3b9c5d3050b0d72ae612b8003d562202a..05644dd1872d8b558ed64f74fc8699d6
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3523,8 +3523,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3517,8 +3517,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1302,7 +1302,7 @@ index ceb420d3b9c5d3050b0d72ae612b8003d562202a..05644dd1872d8b558ed64f74fc8699d6
if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3541,15 +3541,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3535,15 +3535,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}