mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
3d455ff2d5
Upstream has released updates that appear to apply and compile correctly Paper Changes: e4633ca27 [Auto] Updated Upstream (Bukkit/CraftBukkit) a23be44da [Auto] Updated Upstream (CraftBukkit) e40ea889d [CI-SKIP] Deprecate the view distance APIs on Player (#4945) d9fd54e16 Do not crash from invalid ingredient lists in VillagerAcquireTradeEvent 24388381a Fix lead duplication Tuinity Changes: 09423b6 Update to Starlight 0.0.2-RC3 f06591a Update Upstream (Paper) d2aa70f Revert special block lookup for chunksection
20 lines
1.0 KiB
Diff
20 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 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
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
index 5bee05e6e8b52d1edea81a0d76ec9cfdb5acf704..36be65f9a36ea1b35ffa882eec295e1f46021f0c 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -1406,7 +1406,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
|