mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Updated Upstream (Paper & Tuinity)
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
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index 988e8545d4f9bf0fb0b8b8b482a29775b8a5c9f1..59f24ab35da5e3eb4d71dc9b3445abd6a2536266 100644
|
||||
index 3906805c5d6b9203e1ad160207154493660c8188..50cd947d0e47e7897a071fdf8ff6e5834e137d58 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -1019,7 +1019,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
@@ -1030,7 +1030,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
if (this.isInvulnerable(damagesource)) {
|
||||
return false;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user