From 506b716f7bbcbd0fddd3f3cee14cc1d9a804a3a0 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Fri, 3 Jun 2022 19:31:43 -0500 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/server/0025-Fix-negative-death-times.patch | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7ed51aa..a806fe3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.18.2-R0.1-SNAPSHOT mcVersion=1.18.2 -paperRef=80d5e71908d7a555289b2e478245879f9e3bcb55 +paperRef=bed5cb2b81033f30be5a3edace00534a13ad2631 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0025-Fix-negative-death-times.patch b/patches/server/0025-Fix-negative-death-times.patch index 5247099..5b8ef74 100644 --- a/patches/server/0025-Fix-negative-death-times.patch +++ b/patches/server/0025-Fix-negative-death-times.patch @@ -1,20 +1,20 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Telesphoreo -Date: Fri, 22 Apr 2022 00:49:51 -0500 +Date: Fri, 3 Jun 2022 19:30:14 -0500 Subject: [PATCH] Fix negative death times diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1521f53ee1bd85ca44a68b2c9d969eaf63fa342e..12e5d00bab016e4e46527719045c63c2d10d7ea7 100644 +index d6ef140bcc35b10f78f2ec2f10c8a153395fc9df..d8393887cc98930815864eca28b07ef89b26f39e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -620,8 +620,7 @@ public abstract class LivingEntity extends Entity { +@@ -620,7 +620,7 @@ public abstract class LivingEntity extends Entity { protected void tickDeath() { ++this.deathTime; -- if (this.deathTime >= 20 && !this.isRemoved() && !this.level.isClientSide()) { // CraftBukkit - (this.deathTicks == 20) -> (this.deathTicks >= 20 && !this.dead) -- this.level.broadcastEntityEvent(this, (byte) 60); -+ if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.isRemoved() && !this.level.isClientSide()) { // CraftBukkit - (this.deathTicks == 20) -> (this.deathTicks >= 20 && !this.dead) this.level.broadcastEntityEvent(this, (byte) 60); +- if (this.deathTime == 20 && !this.level.isClientSide()) { ++ if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level.isClientSide()) { + this.level.broadcastEntityEvent(this, (byte) 60); this.remove(Entity.RemovalReason.KILLED); }