mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +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] Drowning Settings
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index f9111dc426a539c91665840d772258f76b6d1c76..fafea41a3d05936d898da39017eb8ee8e28c520e 100644
|
||||
index 3753502af217ed6d06f03d250a069b1e0be7ebe5..ddf1fc47c3d01ec589548081ca9f01f8d6ccd642 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -3101,7 +3101,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
@@ -3110,7 +3110,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
}
|
||||
|
||||
public int getMaxAirSupply() {
|
||||
@@ -18,7 +18,7 @@ index f9111dc426a539c91665840d772258f76b6d1c76..fafea41a3d05936d898da39017eb8ee8
|
||||
|
||||
public int getAirSupply() {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index e9ee22f12f542f0c2d1a4ecedc891d708491a8eb..4f9b44c1a1421969f454cb2984d0b7ce21357225 100644
|
||||
index 920fddcc5971915c542891e0f2a4a48e5626765f..253ee4d72d1b40a49049692bc02f6be997a2e079 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -423,7 +423,7 @@ public abstract class LivingEntity extends Entity {
|
||||
|
||||
Reference in New Issue
Block a user