Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +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@70b0e84 Properly apply damage tick after absorption (#11043)
This commit is contained in:
granny
2024-07-08 19:57:42 -07:00
parent cb0f04bd77
commit ff19bccd8c
12 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0251-Remove-Mojang-Profiler.patch
View File

@@ -1166,7 +1166,7 @@ index 126f0ddc96193d482ebe00ff157fe08b0a641a9d..badf612b7ef717996037b7eacecd74a7
}
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 1e43127fb05f1eb3beef5d3f8b8f06926bf11f61..ed31f3e9741909c1840c46f993aead43a626dc64 100644
index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee00d3b1cfa 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -445,7 +445,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1187,7 +1187,7 @@ index 1e43127fb05f1eb3beef5d3f8b8f06926bf11f61..ed31f3e9741909c1840c46f993aead43
}
@Override
@@ -3257,10 +3257,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3256,10 +3256,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1201,7 +1201,7 @@ index 1e43127fb05f1eb3beef5d3f8b8f06926bf11f61..ed31f3e9741909c1840c46f993aead43
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3272,7 +3272,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3271,7 +3271,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1210,7 +1210,7 @@ index 1e43127fb05f1eb3beef5d3f8b8f06926bf11f61..ed31f3e9741909c1840c46f993aead43
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3512,19 +3512,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3511,19 +3511,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1235,7 +1235,7 @@ index 1e43127fb05f1eb3beef5d3f8b8f06926bf11f61..ed31f3e9741909c1840c46f993aead43
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3551,8 +3551,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3550,8 +3550,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1246,7 +1246,7 @@ index 1e43127fb05f1eb3beef5d3f8b8f06926bf11f61..ed31f3e9741909c1840c46f993aead43
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3577,8 +3577,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3576,8 +3576,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1257,7 +1257,7 @@ index 1e43127fb05f1eb3beef5d3f8b8f06926bf11f61..ed31f3e9741909c1840c46f993aead43
if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3595,15 +3595,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3594,15 +3594,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}