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@eb0693f Fix EntityDeathEvent cancellation (#9323)
PaperMC/Paper@f8cfdd4 Fix SmithingInventory helper slot methods for 1.20 (#9325)
PaperMC/Paper@de19eb8 fix incorrectly updated move vector checking patch (#9328)
PaperMC/Paper@87dfff4 Implement BossBarViewer on Player (#9332)
PaperMC/Paper@2d09115 Use net.kyori.ansi for console logging (#9313)
PaperMC/Paper@b48e2e3 Fix dev bundle generation
PaperMC/Paper@c287e92 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9301)
PaperMC/Paper@2e363c7 1.20.1 (#9333)
This commit is contained in:
Ben Kerllenevich
2023-06-13 13:40:15 -04:00
parent 788c14f02c
commit cc465d63cd
103 changed files with 302 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0053-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 c8fea6ecc4507615d60f080be5707b16211c32f3..f710e0ba731071570bf84467e5dc884d4b4ca7dd 100644
index 2fca6643002d441ddb5bcfc696f577d9ce25549f..675f18de57a96b2f910c4dfb8bbce37773fa2fce 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -867,7 +867,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -18,10 +18,10 @@ index c8fea6ecc4507615d60f080be5707b16211c32f3..f710e0ba731071570bf84467e5dc884d
&& (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
// 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 95c7c83e1b1e9f1667bd4b12c787d5cb18ab9734..7cdbf5e9a10ae4a1f846c39b02af61c73d4ee0a5 100644
index 51b575b5f088b61ab061ce4245488ed7461210ee..bfc9018b25f86ceb30ac16f661d859a7af593196 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2481,7 +2481,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2484,7 +2484,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Override
protected void onBelowWorld() {
@@ -31,7 +31,7 @@ index 95c7c83e1b1e9f1667bd4b12c787d5cb18ab9734..7cdbf5e9a10ae4a1f846c39b02af61c7
protected void updateSwingTime() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5b50a6c932c1a963627ffe5083aa78831ee8d3a6..59ea4e7f8bf404f239f329fda94b2c526245fb50 100644
index e1aace18bab71adbfd062685a525551f55d7439c..af4dce5c4708e0540819af2388e9a38b2710b041 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 {