Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7f7d05a [ci skip] Remove IRC link from the README (#10194)
PaperMC/Paper@ed130f1 [ci skip] clarify javadocs for Block#getDrops (#10153)
PaperMC/Paper@4643b0d Shulker duplicate event (#10135)
PaperMC/Paper@b333831 Make spawn egg colours visible (#10158)
PaperMC/Paper@0cc3a7e Disable memory reserve allocating (#10180)
PaperMC/Paper@3841722 Properly check if a loot table exists (#10190)
PaperMC/Paper@b3c8108 [ci skip] Fix incorrect documentation for BlockDropItemEvent (#10175)

Pufferfish Changes:
pufferfish-gg/Pufferfish@3fc02bb Updated Upstream (Paper)
pufferfish-gg/Pufferfish@f5fa99a Oops
This commit is contained in:
granny
2024-01-27 21:56:50 -08:00
parent ce7eaa1763
commit 030cb9e4d3
33 changed files with 187 additions and 187 deletions

View File

@@ -5,10 +5,10 @@ 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 c4e3a662374ca1695c8e66d74a7a625664c160d7..605c15bb3ca7f4c13a7c869ccd61961d5e01937e 100644
index 73454dbffd3def4ab40ff215dcbb4a4a7b839e6d..31c51f882fa1e6c45daeb9b8c2cd32388ed2367e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -902,7 +902,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -899,7 +899,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
public void checkBelowWorld() {
// Paper start - Configurable nether ceiling damage