mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
ef94c821f3
Upstream has released updates that appears to apply and compile correctly Paper Changes: 23ee0a8a Fix issue with 0,0 chunks causing crash bc8fafb2 Updated Upstream (CraftBukkit/Spigot) ebbca5ce Drowned is a RangedEntity (fixes API for Drowned to support Ranged) 83b03eee Don't move existing players to world spawn 3b3e38fd Fix issue with loading chunk during ticking chunks issue 78431dca Update test server startup script
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From dc9f0ba242e502afa865cf21bb60515bb5b9e32a 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 d94ca2acf0..3a4c88bd8a 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -1106,7 +1106,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
|
|
|