mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-21 07:49:29 +00:00
ac8701995c
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@906df69 Prevent internal NPE on ItemStack#damage (#10836) PaperMC/Paper@79e2cb6 Update upstream (Bukkit/CraftBukkit/Spigot) (#10875)
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samsuik <40902469+Samsuik@users.noreply.github.com>
|
|
Date: Fri, 8 Dec 2023 18:21:56 +0000
|
|
Subject: [PATCH] Add instant mob death animation
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index 2fb84d928884050c63cfa598d45dda39a7c2cec4..c0a0a8808003d7e56c4de4f4ad1c494b15cc41a2 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -1796,6 +1796,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
|
|
// Paper start
|
|
if (this.dead) { // Paper
|
|
+ // Sakura start
|
|
+ if (level().sakuraConfig().entity.instantDeathAnimation && !(this instanceof Player)) {
|
|
+ this.deathTime = 20;
|
|
+ return;
|
|
+ }
|
|
+ // Sakura end
|
|
this.level().broadcastEntityEvent(this, (byte) 3);
|
|
this.setPose(Pose.DYING);
|
|
}
|