mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
ce403193df
Upstream has released updates that appears to apply and compile correctly Paper Changes: ab347c4c9 Updated Upstream (Bukkit/CraftBukkit/Spigot) e2e09326d [Auto] Updated Upstream (Bukkit/CraftBukkit) 778d63b19 Add Gradle usage information to README (#3700) 25c14f76f Fix compile 78c855237 Updated Upstream (CraftBukkit) 8a4af269b fix EntityDismountEvent being fired on gen threads 55fb7da78 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 d70195264 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 443fb80bf Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 d75c939e5 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 1431b1d6c Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 e4f2ec002 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 122475aee Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 b98da027d Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 a8ffecc74 Fix NPE and uuid lookup for player skulls
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From e5a6ecb6355378875b4a83f3976dbade4ffcb490 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 3556e86fd7..42f3ef1ee6 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -1243,7 +1243,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.26.2
|
|
|