diff --git a/gradle.properties b/gradle.properties index 53cbc81..c5b2b6d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,10 @@ group=me.samsuik.sakura -version=1.21-R0.1-SNAPSHOT +version=1.21.1-R0.1-SNAPSHOT +mcVersion=1.21.1 -mcVersion=1.21 -paperRef=4e6a2a13a3e1f6fa1067a7821d2f018339395533 +paperRef=70dfa467e796a0dfaf74147fe3560e07a5816054 org.gradle.jvmargs=-Xmx2G - org.gradle.vfs.watch=false org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0028-Configure-Entity-Knockback.patch b/patches/server/0028-Configure-Entity-Knockback.patch index 294db34..c89f42b 100644 --- a/patches/server/0028-Configure-Entity-Knockback.patch +++ b/patches/server/0028-Configure-Entity-Knockback.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configure Entity Knockback diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e39732b16d0b8d47759b8fc282e4a9a158991104..64b55ad9544867ad0423aec368ff878d3ab8168f 100644 +index a744a01f3ef98e06af3696a58f5b1ae072dc8953..b188cc18d8bb6c37c1993bdaf39f521048d44956 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1570,7 +1570,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -56,7 +56,7 @@ index e39732b16d0b8d47759b8fc282e4a9a158991104..64b55ad9544867ad0423aec368ff878d - Vec3 finalVelocity = new Vec3(vec3d.x / 2.0D - vec3d1.x, this.onGround() ? Math.min(0.4D, vec3d.y / 2.0D + d0) : vec3d.y, vec3d.z / 2.0D - vec3d1.z); + Vec3 finalVelocity = new Vec3(velocityX, velocityY, velocityZ); // Sakura - configure entity knockback Vec3 diff = finalVelocity.subtract(vec3d); - io.papermc.paper.event.entity.EntityKnockbackEvent event = CraftEventFactory.callEntityKnockbackEvent((org.bukkit.craftbukkit.entity.CraftLivingEntity) this.getBukkitEntity(), attacker, cause, d0, diff); + io.papermc.paper.event.entity.EntityKnockbackEvent event = CraftEventFactory.callEntityKnockbackEvent((org.bukkit.craftbukkit.entity.CraftLivingEntity) this.getBukkitEntity(), attacker, attacker, cause, d0, diff); // Paper end - knockback events 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 8b2b495f34b1ae96901ed8f2ca2d8d753b4eb2c8..4c5779112c5e7b880627ecc446a295eeeadb396e 100644