Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
7caed1a8 [CI-SKIP] Rebuild patches
777073a5 Check horse entity validity in container interactions (#2584)
d69fe6c5 Fix zero-tick instant grow farms MC-113809 (#2559)
c68dbb86 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2576)
1e521994 Update Paperclip
30f9955e Fix race conditions in flush allowing for previously scheduled tasks to execute later than the flush call (#2548)
9e1620e3 Improve save logic (#2485)
72860501 [CI-SKIP] Fix duplicate patch number
87355875 Fix nether portal frame creation (#2546)
26acc9b7 Re-add flat bedrock config option
This commit is contained in:
William Blake Galbreath
2019-09-26 11:40:21 -05:00
parent 791e4e3372
commit 2d212d6e78
37 changed files with 82 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0007-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From e86b380d27506dc0ec88722728b583e6d1772139 Mon Sep 17 00:00:00 2001
From b5eeca0365ecd96c0772b82a84179b77bbb1b89d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:45 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -39,7 +39,7 @@ index 8aa60e95f..e60eedb54 100644
if (i > 0) {
this.damageEntity(DamageSource.FALL, (float) i);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ba9b21549..a661d109d 100644
index 0abca1a5b..4b59f6081 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity {
@@ -73,10 +73,10 @@ index d052dedec..a5dade7d0 100644
if (i > 0) {
if (f >= 6.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index e0de3820f..18d057f0e 100644
index b27fd44dc..33f56b85e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -699,4 +699,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -712,4 +712,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return getHandle().isHandRaised();
}
// Paper end
@@ -94,5 +94,5 @@ index e0de3820f..18d057f0e 100644
+ // Purpur end
}
--
2.20.1
2.23.0.rc1