mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f75636b [ci skip] Update my name in author field (#6625) PaperMC/Paper@d2c2b7a Implement Translatable on villager Profession (#6542) PaperMC/Paper@9087993 Mark fish and axolotls from buckets as persistent (#6392) PaperMC/Paper@aad7d37 Fix axolotl/fish persistence PaperMC/Paper@6084ac3 Fix upstream nullability on entity equipment getters (#6519) PaperMC/Paper@655cd8f Fix upstreams fix for composters and variable hoppers (#6563) PaperMC/Paper@7ac51f9 Include slot when constructing the bukkit Attribute Modifiers (#6537) PaperMC/Paper@caa4780 Add more component name methods (#6578) PaperMC/Paper@9460497 Apply furnace cook speed multiplier through event (#6378) PaperMC/Paper@f4f5a76 Fix anvil inventory events (#6157) PaperMC/Paper@1707c10 fixes cancelling PlayerTradeEvent (#5612)
This commit is contained in:
@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
|
||||
Co-authored by: Encode42 <me@encode42.dev>
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 487fd05a2d5946b7f0325b81dce1f8acf28f0db4..4f23021c353c926f92d0403b9c9c383b7300db1c 100644
|
||||
index 585054a070701d7ca3edd386ec7ef8627e093797..d7ff6944c39a1ec8ec06ccb9e2c5c2aff068beaa 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -4376,5 +4376,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||||
@@ -333,10 +333,10 @@ index 1f90c40c5e92232c38a33097903fd6e2f6f2ff02..39fa4a9a52c510e88036ab790a8739d2
|
||||
// Paper end
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index c50089b21d3b258ae4b3f0a6b2625fb129764fee..ce85691da804b62591f65e993206a873e84c1f8c 100644
|
||||
index b290df0ac4951abeade7b6b038fe5f963060d425..f42cba9262902c9e3940464418e73fcc8d9e0627 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -1272,5 +1272,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
@@ -1283,5 +1283,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
entity.absMoveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
|
||||
return !entity.valid && entity.level.addEntity(entity, spawnReason);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user