Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +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@31699ae Updated Upstream (Bukkit/CraftBukkit) (#10242)
This commit is contained in:
granny
2024-02-11 21:56:58 -08:00
parent 425889dc45
commit 70a76c42bf
77 changed files with 356 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0133-One-Punch-Man.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] One Punch Man!
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 2688d7d5a9427bc55f8661c7337cdeede582f01e..10c0f0e757331338c7747e9704f57eb4b7c5b848 100644
index 2a5d3d5c0a337933c62e1168de1a595a92bc5444..9c240ce04337458395aea35aab7d97a9f592f008 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2335,6 +2335,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2348,6 +2348,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}
@@ -30,7 +30,7 @@ index 2688d7d5a9427bc55f8661c7337cdeede582f01e..10c0f0e757331338c7747e9704f57eb4
if (human) {
// PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 96835763638abbc120f63a67a9ac4cb853739d78..bf2ab21a5390ac0876b0c2c5e6708cc3d6c564da 100644
index 9fa138e30e3885a760e40f8da32a8a86acf150b7..b30fc0e01ab146f71d6af57544e0f27922456f9e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -344,6 +344,7 @@ public class PurpurWorldConfig {