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:
granny
2021-09-23 13:10:23 -07:00
parent 3b75acda59
commit acb8a26d9a
10 changed files with 27 additions and 27 deletions

View File

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 0b8357f012e3bafcd3b5fb4043392b42cf5cfc2a..c9d64da90a05f252d91dd10d2d5f62ba66afb944 100644
index 892fc137c8c35dc111f739e4ebe66be42229c5d8..a365998c2c359fb6cd535ebf0f2d893943b87b75 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -819,5 +819,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -827,5 +827,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return Whether the entity was successfully spawned.
*/
boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason);