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@8e6554a Fix sending disconnect packet in phases where it doesn't exist
PaperMC/Paper@06e69c8 Use CommandSourceStack in AsyncPlayerSendCommandsEvent (#10826)
PaperMC/Paper@a47e11d fix knockback events (#10831)
PaperMC/Paper@3181470 Add entity heal API (#10267)
This commit is contained in:
granny
2024-05-30 18:44:08 -07:00
parent b1464f3bf7
commit ee56117c43
11 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1085,7 +1085,7 @@ index a715ecf4a8ac91d3e5e5c6269d89e54b2c1cd279..223c3665126c576eddb1a8f7c9f5bc60
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 13f69b9ceb082a013dfe2de2d5807dde77d53a2f..57aa9f71a3b27073f3e229ecd342c52546d151b3 100644
index d42cf771b9cf77304d5174f374c56eb793fc2991..45e06ec0e975973edb4434f64ddfc0f663ca3c31 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -896,7 +896,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -1211,7 +1211,7 @@ index 13f69b9ceb082a013dfe2de2d5807dde77d53a2f..57aa9f71a3b27073f3e229ecd342c525
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199dbf71212f8 100644
index 2fa0404f4f4a332248cdf7e84f2d9723dda7df8b..3c132007cc40a330693e33350e0cad087ac4c90b 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 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3227,10 +3227,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3217,10 +3217,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1246,7 +1246,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3242,7 +3242,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3232,7 +3232,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 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3465,19 +3465,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3455,19 +3455,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1280,7 +1280,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3504,8 +3504,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3494,8 +3494,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1291,7 +1291,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3530,8 +3530,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3520,8 +3520,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1302,7 +1302,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
if (!this.level().isClientSide && !this.isDeadOrDying() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3548,15 +3548,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3538,15 +3538,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}
@@ -1322,7 +1322,7 @@ index 09a00496c003f875e07c249c4a601ec598af0e5e..94bd8a91dba30b2682f245efccc199db
// Purpur start
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 9d532c373ca1762ad48b9b81000d2c11b929d220..429d8b09496d7d6ffc5f44dca953d6194683813b 100644
index 3486c6782f9bbb3477d2fefd1e0a363a5326999f..6cb17876fc0efaf15ab9f54e4c95b9b858b0a5ee 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -376,13 +376,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
@@ -1812,10 +1812,10 @@ index dcf580d852ede8ea01f5d91944a224ec6eca73e4..4be218129188c1be8736940170a861ad
this.assignProfessionWhenSpawned = false;
}
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index 082b804f4793f72e76361f5427f0358273454b3d..bd5fcb028d41b60de183b4d849f1ba10746fa0d0 100644
index 638447e8cb74b26f4f8e3862c2fb4a3048979ebc..2e2461b585d9008f1bbb90f9b45e2a1ad837dbd6 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -681,7 +681,7 @@ public class Explosion {
@@ -668,7 +668,7 @@ public class Explosion {
}
if (flag1) {
@@ -1824,7 +1824,7 @@ index 082b804f4793f72e76361f5427f0358273454b3d..bd5fcb028d41b60de183b4d849f1ba10
List<Pair<ItemStack, BlockPos>> list = new ArrayList();
Util.shuffle(this.toBlow, this.level.random);
@@ -759,7 +759,7 @@ public class Explosion {
@@ -746,7 +746,7 @@ public class Explosion {
Block.popResource(this.level, (BlockPos) pair.getSecond(), (ItemStack) pair.getFirst());
}