mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 19:07:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 4a97a7ca Add option to disable pillager patrols (#2626) 23e53aab Backport MC-160177 fix from 1.15 (#2702) 45089d59 Update upstream CB 761c24fa Fix stuck in sneak when changing worlds (MC-10657) (#2627)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From aff8536930249c18ed0448d8627de98e359c6ef6 Mon Sep 17 00:00:00 2001
|
||||
From c0f77cc38698e65711c583d78967a3d1cd3d8f6b 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
|
||||
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
|
||||
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 e0e94ca11..a90bc090c 100644
|
||||
index d5f80be598..9a76d14a04 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -1079,7 +1079,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
@@ -1081,7 +1081,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
|
||||
@Override
|
||||
public boolean isInvulnerable(DamageSource damagesource) {
|
||||
@@ -21,5 +21,5 @@ index e0e94ca11..a90bc090c 100644
|
||||
|
||||
@Override
|
||||
--
|
||||
2.23.0.rc1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user