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@848a396 Add mob goal generator (#9980)
PaperMC/Paper@ebf97bd [ci skip] Add more patch identifying comments
PaperMC/Paper@94807a1 [ci skip] Minor cleanup and patch merges
This commit is contained in:
granny
2024-01-16 15:33:16 -08:00
parent 486515bc3c
commit 3d52f066c1
67 changed files with 194 additions and 189 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 b0071e7f3b540569364a53bc6c5c022d2ea8a7cf..5ac686c5d3fc20d55899eb7ffafa48c4130344cf 100644
index 29260e8898bb68f4bf31e0bb4b7c721eb5a94344..3922a378360771d8a550c26debbed08222a57d6c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2333,6 +2333,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2334,6 +2334,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}
@@ -30,7 +30,7 @@ index b0071e7f3b540569364a53bc6c5c022d2ea8a7cf..5ac686c5d3fc20d55899eb7ffafa48c4
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 9bd8d873933c4441d5055ea49239623d0fb480b1..a58369d384604e37906cc0d15aad40a9e44019da 100644
index 96835763638abbc120f63a67a9ac4cb853739d78..bf2ab21a5390ac0876b0c2c5e6708cc3d6c564da 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 {