9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-23 16:59:24 +00:00

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@ad03187 drop exact choice recipe book clicks patch, supercedes #1446
PurpurMC/Purpur@ff126d3 Updated Upstream (Paper)
PurpurMC/Purpur@0458d84 Updated Upstream (Paper & Pufferfish)
PurpurMC/Purpur@7aa6845 Add option to disable the copper oxidation proximity penalty (#1443)
This commit is contained in:
NONPLAYT
2023-10-17 01:55:31 +03:00
parent 46b2883a3a
commit 181a454042
11 changed files with 48 additions and 48 deletions

View File

@@ -7,10 +7,10 @@ Original project: Bloom-host/Petal
Link: https://github.com/Bloom-host/Petal
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 4604e63cec3c25a1257892d4c1ea9db098815b93..b7856f4a41ba44e7bd30bd8917524aca813a32ba 100644
index aa7ef9bcd6caffa9b987ae4ae759f89358e3001d..fce06936d2af3e69db2b7ef485d929323d4935e7 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1038,20 +1038,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1037,20 +1037,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
if (entity != null) {