Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@ef0e5a6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2022-09-13 17:32:56 -05:00
parent 664774af5a
commit 6e7bb8323f
40 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0060-Configurable-void-damage-height-and-damage.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6db529112934aa1414aee77bd0f3d2660a8ee105..6d3eace7ae27f4d8d8c6d0eba93ebaacfa19c5f8 100644
index ec422c3c233454280132b0364b66d802fb32c006..5af14bd15b134b87f2b8afc35b00f8798d1e8486 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -890,7 +890,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -18,10 +18,10 @@ index 6db529112934aa1414aee77bd0f3d2660a8ee105..6d3eace7ae27f4d8d8c6d0eba93ebaac
&& this.getY() >= this.level.paperConfig().environment.netherCeilingVoidDamageHeight)) {
// Paper end
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index cb90fec7558923f547bab2d37ceffd67c07501ce..b20bea5bba517bbbc5f338f1d580588177969450 100644
index fe6483d505f9148f82f80abc1438945ed0741ba3..cf67b497d1a0e56fa949802804d6d2cf855d52ff 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2466,7 +2466,7 @@ public abstract class LivingEntity extends Entity {
@@ -2488,7 +2488,7 @@ public abstract class LivingEntity extends Entity {
@Override
protected void outOfWorld() {
@@ -31,7 +31,7 @@ index cb90fec7558923f547bab2d37ceffd67c07501ce..b20bea5bba517bbbc5f338f1d5805881
protected void updateSwingTime() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 699fb31a9ce01e88b0a1fb2af99b74ec64856eb0..dfd0af9ed3c8bffc08f6fd0f39885db6f26aa901 100644
index 56f590e38064ac9ab8b2ded728f238f40f1418e6..016c5bdcc9a90eb4dbe1c088ec2ca247ee1ab7a8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -100,10 +100,14 @@ public class PurpurWorldConfig {