mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
e4b55a3da2
Upstream has released updates that appears to apply and compile correctly Paper Changes: 5dc6bd45 Optimize call to getFluid for explosions (#2859) 0f795c3e Updated Upstream (CraftBukkit) 1d5bd44d Fix entity teleportation exceptions bd0337b7 Updated Upstream (Bukkit/CraftBukkit/Spigot) 654a1316 Add more chunk debug to watchdog (#2851)
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From 16066e973580d0b1fc87d9f012fcfde6a914e644 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sun, 21 Jul 2019 18:01:46 -0500
|
|
Subject: [PATCH] Players should not cram to death
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/EntityPlayer.java | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
index bcab00c068..f7df54228d 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -1092,7 +1092,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
|
|
@Override
|
|
public boolean isInvulnerable(DamageSource damagesource) {
|
|
- return super.isInvulnerable(damagesource) || this.H() || this.abilities.isInvulnerable && damagesource == DamageSource.WITHER;
|
|
+ return super.isInvulnerable(damagesource) || this.H() || damagesource == DamageSource.CRAMMING || this.abilities.isInvulnerable && damagesource == DamageSource.WITHER; // Purpur
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.24.0
|
|
|