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

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@b0ef3ca Only call EntityDamageEvents before actuallyHurt (#11045)
PaperMC/Paper@20889d0 Fix method reflection remapping with null parameter types passed
This commit is contained in:
granny
2024-07-11 08:54:06 +00:00
parent ff19bccd8c
commit b3709b1f4d
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 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee00d3b1cfa 100644
index 30149ed40d34818bdbd9098298e8f4cf82116c4c..b4c325979107e0a731d1c955c53b1e76471871ad 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 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
}
@Override
@@ -3256,10 +3256,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3272,10 +3272,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1201,7 +1201,7 @@ index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3271,7 +3271,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3287,7 +3287,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 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3511,19 +3511,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3527,19 +3527,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1235,7 +1235,7 @@ index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3550,8 +3550,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3566,8 +3566,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1246,7 +1246,7 @@ index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3576,8 +3576,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3592,8 +3592,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1257,7 +1257,7 @@ index 90cc9ab0b837ec0642b479d7a047931a15bdab2a..51ed760613c72c6719ab844c39f4cee0
if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3594,15 +3594,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3610,15 +3610,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}