mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
21e0b98494
Upstream has released updates that appears to apply and compile correctly Paper Changes: 372dc10f Updated Upstream (CraftBukkit) (#4760) d6fb9717 Updated Upstream (CraftBukkit) Tuinity Changes: 2194b64 Optimizations (starlight, aka leaflight) 1a412ae Fix worldborder crash 957a2ef Fix chunk object leak bcfe550 Re-Add unload poi data patch
20 lines
1011 B
Diff
20 lines
1011 B
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 ed667f727..287a496ee 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -1392,7 +1392,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
|