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

@@ -173,10 +173,10 @@ index 0000000000000000000000000000000000000000..c0ec5a130985e8da4cc9e596a6b70503
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index a9e455c5b3bbe4edbdb71f86f5c6eebc2f605547..c6f33ed7502fe8ad58f937ac2e326b85416452c2 100644
index b02704b0535522c5535b560105eec2885fdd3e77..a8feed523e4fbf56679166c71e3576b2e978df8c 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -753,4 +753,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -761,4 +761,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
public boolean isTicking();
// Paper end