mirror of https://github.com/YatopiaMC/Yatopia.git
39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Phoenix616 <mail@moep.tv>
|
|
Date: Thu, 23 Apr 2020 18:03:57 +0100
|
|
Subject: [PATCH] Don't wake up entities when damage event is cancelled
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
|
index 88fc16e49076cf5589e27660a388909291447fac..d8fb0edceba805b9359d02304751182cd0c5a79f 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
|
@@ -1208,9 +1208,12 @@ public abstract class EntityLiving extends Entity {
|
|
} else if (damagesource.isFire() && this.hasEffect(MobEffects.FIRE_RESISTANCE)) {
|
|
return false;
|
|
} else {
|
|
- if (this.isSleeping() && !this.world.isClientSide) {
|
|
- this.entityWakeup();
|
|
- }
|
|
+ // Origami start - Don't wake up entities when damage event is cancelled
|
|
+ // moved down into damageEntity0
|
|
+ //if (this.isSleeping() && !this.world.isClientSide) {
|
|
+ // this.entityWakeup();
|
|
+ //}
|
|
+ // Origami end
|
|
|
|
this.ticksFarFromPlayer = 0;
|
|
float f1 = f;
|
|
@@ -1961,6 +1964,11 @@ public abstract class EntityLiving extends Entity {
|
|
if (event.isCancelled()) {
|
|
return false;
|
|
}
|
|
+ // Origami start - Don't wake up entities when damage event is cancelled
|
|
+ if (this.isSleeping() && !this.world.isClientSide) {
|
|
+ this.entityWakeup();
|
|
+ }
|
|
+ // Origami end
|
|
|
|
f = (float) event.getFinalDamage();
|
|
|