Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +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:
1daafe455 Updated Upstream (Bukkit/CraftBukkit)
98828b006 Merge pull request #4132 from Proximyst/progress/1.16.2
b23f27f8d  Fix incorrect return for WorldServer#addAllEntitiesSafely (#3)
5085fa30c Fix MC-187716 Use configured height
c44add5a0 Initialise a new chunk section if none was found yet updated
74a4d5f8b Remove armour stand double add to world
6d25cc4ec Don't mark null chunk sections for block updates
This commit is contained in:
William Blake Galbreath
2020-08-16 09:32:41 -05:00
parent 38c21107af
commit 6b4bc4775d
18 changed files with 184 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0081-Configurable-void-damage-height.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f3e9c8460..40fad381e 100644
index e208190073..305b63b295 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -611,7 +611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -612,7 +612,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// Paper start
protected void performVoidDamage() {
@@ -18,7 +18,7 @@ index f3e9c8460..40fad381e 100644
&& this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) {
this.doVoidDamage();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6ac786206..a071129db 100644
index 6ac7862063..a071129db0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -115,12 +115,14 @@ public class PurpurWorldConfig {