Updated Upstream (Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Pufferfish Changes:
pufferfish-gg/Pufferfish@fb73c9b Updated Upstream (Paper)
pufferfish-gg/Pufferfish@f572e28 Disable suffocation optimization for withers
pufferfish-gg/Pufferfish@3d174ab Merge branch 'wefhy-ver/1.20' into ver/1.20 (#80)
pufferfish-gg/Pufferfish@e32a780 Updated Upstream (Paper)
This commit is contained in:
granny
2023-09-03 22:46:44 -07:00
parent 423c2af60c
commit 042e192444
18 changed files with 77 additions and 105 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 8c0ef795691aa17e9522b2deda794bcdf38c64b6..6edb9c371d77fa52b08f0eaf738d0cb4b0af86ce 100644
index 29d523efe2222511c25c8d8a3eeff6adf2a2da0e..c75d3490dd475fc7c1bd4931841cc84888a23bac 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1590,6 +1590,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1594,6 +1594,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}