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@178f035 Restore no-crash behaviour when read-only config file(s) (#8318)
PaperMC/Paper@267dd18 Stop large look changes from crashing the server (#8326)
PaperMC/Paper@36f0c1b Rebuild patches
PaperMC/Paper@751d092 Properly close section storage managed files (#8364)
PaperMC/Paper@f5f84ff Add custom destroyerIdentity parameter to the sendBlockBreak function (#5840)
PaperMC/Paper@05f6a5c Limit size of Authenticator Cache Thread Pool (#8360)
PaperMC/Paper@ef670eb EndDragonFight killed statuses should be false for newly created worlds (#8354)
PaperMC/Paper@b826065 fire EntityChangeBlockEvent in more places (#6371)
PaperMC/Paper@34777cd Missing eating regain reason (#8244)
PaperMC/Paper@dbda887 Missing some effect cause (#8307)
PaperMC/Paper@63cb747 Added byte array serialization/deserialization for PersistentDataContainers (#7505)
This commit is contained in:
BillyGalbreath
2022-09-18 19:52:48 -05:00
parent 6e7bb8323f
commit a448748b1a
27 changed files with 109 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0289-Remove-Mojang-Profiler.patch
View File

@@ -1187,7 +1187,7 @@ index 34c823876efc78a5f5fe111b3d10e5240f76215f..ffbe6f3b5fdd60332627fdb6a7ea050d
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index b37d3f293cf73730626f0a7da84058f42f071181..8f80b2f14c582d248988a824193d1fd0df177dc5 100644
index b391e04a1de88f465e609cbcd77ba97e3d851fb3..260e094bad8d6f1b775e317ba2c9b3e25cfa7467 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -397,7 +397,7 @@ public abstract class LivingEntity extends Entity {
@@ -1220,18 +1220,18 @@ index b37d3f293cf73730626f0a7da84058f42f071181..8f80b2f14c582d248988a824193d1fd0
+ //this.level.getProfiler().pop(); // Purpur
+ //this.level.getProfiler().push("rangeChecks"); // Purpur
while (this.getYRot() - this.yRotO < -180.0F) {
this.yRotO -= 360.0F;
@@ -3124,7 +3124,7 @@ public abstract class LivingEntity extends Entity {
this.yHeadRotO += 360.0F;
}
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3102,7 +3102,7 @@ public abstract class LivingEntity extends Entity {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
- this.level.getProfiler().pop();
+ //this.level.getProfiler().pop(); // Purpur
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3406,19 +3406,19 @@ public abstract class LivingEntity extends Entity {
@@ -3384,19 +3384,19 @@ public abstract class LivingEntity extends Entity {
}
this.setDeltaMovement(d4, d5, d6);
@@ -1256,7 +1256,7 @@ index b37d3f293cf73730626f0a7da84058f42f071181..8f80b2f14c582d248988a824193d1fd0
if (this.jumping && this.isAffectedByFluids()) {
double d7;
@@ -3445,8 +3445,8 @@ public abstract class LivingEntity extends Entity {
@@ -3423,8 +3423,8 @@ public abstract class LivingEntity extends Entity {
this.noJumpDelay = 0;
}
@@ -1267,7 +1267,7 @@ index b37d3f293cf73730626f0a7da84058f42f071181..8f80b2f14c582d248988a824193d1fd0
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3455,8 +3455,8 @@ public abstract class LivingEntity extends Entity {
@@ -3433,8 +3433,8 @@ public abstract class LivingEntity extends Entity {
// SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper
this.travel(new Vec3((double) this.xxa, (double) this.yya, (double) this.zza));
// SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper
@@ -1278,7 +1278,7 @@ index b37d3f293cf73730626f0a7da84058f42f071181..8f80b2f14c582d248988a824193d1fd0
boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
int i;
@@ -3476,15 +3476,15 @@ public abstract class LivingEntity extends Entity {
@@ -3454,15 +3454,15 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.FREEZE, (float) i);
}
@@ -1513,7 +1513,7 @@ index c960aac9e1dbffe5e765f9adcfacc1966dc29148..c233533fdacb4f5e635267b5fc9fe21b
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index 32870e6727d09fbf1c4913ffdf321a278b5b6f64..50f19125fa3dda79a850cfce0ab7c72045d6220b 100644
index b543387da275a0b3675a968b6cebf05cc227af14..2e0f340f9b339b1d772c0676e97c12f389827848 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -328,13 +328,13 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {