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

Updated Upstream (CraftBukkit) (#9053)

Browse source 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
f92c94517 SPIGOT-7310: PlayerToggleSneakEvent is not called when a player sneaks while riding an entity
b5714184d SPIGOT-7316: Cancelling EntityUnmountEvent does not stop the all effects of the unmounting
e237f8c88 SPIGOT-7312: Entity#setVisibleByDefault on player causes skin reset on this player client
This commit is contained in:
Jake Potrebic 2023-03-26 13:29:41 -07:00 • committed by GitHub
parent a622ebacd4
commit fbf74ba0ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
70 changed files with 226 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,10 +28,10 @@ index 9ec30af85095a9993076dafacbecc21b580d06ce..72d62387bfdcbf8e69fe433145be81fb
+ // Paper end
}
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 b716f297462b29c79500820859b9735c3576a2be..dcbf1e6e494493d81b7a10454a531b0fb719e024 100644
index 997b2458a3e14296437e76737b837d90d4936072..6416cd9a20a40c24b3182891da04d660f9fa9aee 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1255,7 +1255,7 @@ public abstract class Player extends LivingEntity {
@@ -1261,7 +1261,7 @@ public abstract class Player extends LivingEntity {
flag1 = true;
}
@ -40,7 +40,7 @@ index b716f297462b29c79500820859b9735c3576a2be..dcbf1e6e494493d81b7a10454a531b0f
flag2 = flag2 && !level.paperConfig().entities.behavior.disablePlayerCrits; // Paper
flag2 = flag2 && !this.isSprinting();
@@ -1295,7 +1295,7 @@ public abstract class Player extends LivingEntity {
@@ -1301,7 +1301,7 @@ public abstract class Player extends LivingEntity {
}
Vec3 vec3d = target.getDeltaMovement();
@ -49,7 +49,7 @@ index b716f297462b29c79500820859b9735c3576a2be..dcbf1e6e494493d81b7a10454a531b0f
if (flag5) {
if (i > 0) {
@@ -1323,7 +1323,7 @@ public abstract class Player extends LivingEntity {
@@ -1329,7 +1329,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