mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Moar 1.19 fixes (#7884)

Browse source
This commit is contained in:
Noah van der Aa 2022-06-08 15:38:56 +02:00 • committed by GitHub
parent 55d7f562b8
commit b1f5e70075
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 182 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0711-Add-critical-damage-API.patch
View file

@ -29,10 +29,10 @@ index 752f9f11227a47b7bed675b93e95af89c6732f63..67bce77093dcc126098731047447da20
public static DamageSource sting(LivingEntity attacker) {
return new EntityDamageSource("sting", attacker);
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 8d8ecdbb8447a2d19cf380ae1f35291c3adf3300..c8b87d5f7af7f19968007cbc18359f0af33040a5 100644
index 3ef7815063d3dce4044710e685a01b8f02f7c005..25408bec63bbc8ff44882f7491e81eb1f91058ee 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1275,7 +1275,7 @@ public abstract class Player extends LivingEntity {
@@ -1273,7 +1273,7 @@ public abstract class Player extends LivingEntity {
flag1 = true;
}
@ -41,7 +41,7 @@ index 8d8ecdbb8447a2d19cf380ae1f35291c3adf3300..c8b87d5f7af7f19968007cbc18359f0a
flag2 = flag2 && !level.paperConfig.disablePlayerCrits; // Paper
flag2 = flag2 && !this.isSprinting();
@@ -1315,7 +1315,7 @@ public abstract class Player extends LivingEntity {
@@ -1313,7 +1313,7 @@ public abstract class Player extends LivingEntity {
}
Vec3 vec3d = target.getDeltaMovement();
@ -50,7 +50,7 @@ index 8d8ecdbb8447a2d19cf380ae1f35291c3adf3300..c8b87d5f7af7f19968007cbc18359f0a
if (flag5) {
if (i > 0) {
@@ -1343,7 +1343,7 @@ public abstract class Player extends LivingEntity {
@@ -1341,7 +1341,7 @@ public abstract class Player extends LivingEntity {
if (entityliving != this && entityliving != target && !this.isAlliedTo((Entity) entityliving) && (!(entityliving instanceof ArmorStand) || !((ArmorStand) entityliving).isMarker()) && this.distanceToSqr((Entity) entityliving) < 9.0D) {
// CraftBukkit start - Only apply knockback if the damage hits