mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1e5d1db Call StructureGrowEvent for mangrove propagule (#8023) PaperMC/Paper@385f313 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8092) PaperMC/Paper@fbb11db Add missing EntityDropItemEvent calls (#5674) PaperMC/Paper@c879064 Call EntityDropItemEvent for goats dropping horns (#8094)
This commit is contained in:
@@ -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 a33b5792a2966847568d6d96e696fef18200b872..f6201f11bceeec05d436fa68354c222995d7bc2f 100644
|
||||
index 592ca6d3a49f08721f38f84b580bc46a0fb92dd5..28fa14e0cc2a0a93782bd0a8063553ff2d55a2e7 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -889,7 +889,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
@@ -890,7 +890,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
|
||||
public void checkOutOfWorld() {
|
||||
// Paper start - Configurable nether ceiling damage
|
||||
@@ -18,7 +18,7 @@ index a33b5792a2966847568d6d96e696fef18200b872..f6201f11bceeec05d436fa68354c2229
|
||||
&& this.getY() >= this.level.paperConfig().environment.netherCeilingVoidDamageHeight)) {
|
||||
// Paper end
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index bc19439abb1cbf548b1eda2a6527d9e825ea34ab..40c716bd22d54f7f669d570d1bebcb1848ae66aa 100644
|
||||
index 773f2a44c26c4c5c00fab0b502eb08652f23b56e..723fa3c2a305a160cb05fb5478c96d2c6aadba83 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -2466,7 +2466,7 @@ public abstract class LivingEntity extends Entity {
|
||||
|
||||
Reference in New Issue
Block a user