mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@84b5d4a Reorder bukkit damage source entity for explosion (#8553) PaperMC/Paper@b4c1ae6 Fix MC-121048 (#8429) PaperMC/Paper@825cb43 [ci skip] Add .fleet/ folder to .gitignore (#8574) PaperMC/Paper@669fed4 Fix MC-179072 (#8421) PaperMC/Paper@8f498dc Sync chunk load command improvements (#8554) PaperMC/Paper@3299886 [ci skip] Add TheFruxz to the license MIT list (#8575) PaperMC/Paper@0a6f100 Add more collision code skipping logic (#7581) PaperMC/Paper@76503f8 Strip coordinates from lodestone compasses (#8561) PaperMC/Paper@b95d4b2 Moving ATs from the at file to individual patches (#8573) PaperMC/Paper@4a3ae59 [ci skip] Add check for git repo (#8578) PaperMC/Paper@a7df847 Add Player Warden Warning API (#8470) PaperMC/Paper@3ab194e Avoid a cubed max search distance for POIs (#8576)
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
index 1f0f31269fa21348cd8617a8e2d098dc2a8d0f85..8401577ee010c211c99c174bc70536d606a09b1d 100644
|
||||
index 4ffe3171067a448128644a9501b6160625870459..44af2badf212f740ca7a7b24b960f86fef359588 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -3465,7 +3465,16 @@ public abstract class LivingEntity extends Entity {
|
||||
@@ -3478,7 +3478,16 @@ public abstract class LivingEntity extends Entity {
|
||||
int j = i / 10;
|
||||
|
||||
if (j % 2 == 0) {
|
||||
@@ -54,7 +54,7 @@ index 88306f54c0f8ee83020d94f20b62762910c9e9b2..736259c76dfc15784d678d2ed8074b71
|
||||
itemStack.shrink(1);
|
||||
} else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
||||
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||
index 3d1ba3d3b12fe649e451b6c8a3726c6991cfe083..2b2115d218a279245f8be5e0c93a2b6200f81241 100644
|
||||
index 399a155fb49e4af144e3296b4ad0c55588c9be5b..9e308183917884dcb2f8831324d45c9aeef55051 100644
|
||||
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
|
||||
@@ -564,7 +564,7 @@ public final class ItemStack {
|
||||
|
||||
Reference in New Issue
Block a user