mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
bbcde382a2
Upstream has released updates that appears to apply and compile correctly Paper Changes: 64666dc8 Improve Chunk Priority, Frustum Priority and Load Speed Algorithms 146b9908 Improve ChunkMapDistance.b crash fix to clean up properly 2c4499b7 Show Plugins Event Listeners under Combined Total in Timings c5c909c9 Improve Plugin Ticket Management b20529f3 Update to HTTPS in README (#3460) de6dfedf Make Anti-Xray multithreaded (#3520) 531c4b3f Add PluginTickets to API Chunk Methods b2d81e21 Improve Chunk Prioritization and Internal Scheduler 24a2e804 Improve Login to use Urgent priority - improves login chunk load times
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From 2f72a538bb9769b59e5d9c52f4ff1869e5178117 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 96f98926eb..9773923735 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -1121,7 +1121,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
|
|
|