Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@855637f Updated Upstream (CraftBukkit) (#7624)
PaperMC/Paper@5eb61dd Buffer OOB setBlock calls
PaperMC/Paper@7b46444 Properly create profiles with custom name/uuid (#7558)
PaperMC/Paper@a686ff5 Add more missing entity API (#7592)
PaperMC/Paper@993f828 Add TameableDeathMessageEvent (#5392)
PaperMC/Paper@a939d6e Fix generator settings string for flat-type worlds (#7568)
PaperMC/Paper@ab666a4 Deprecating remaining blockkey methods (#7638)
PaperMC/Paper@e7d928a Fix EntityChangeBlockEvent#getBlockData for when sheep eats grass block (#7646)

Pufferfish Changes:
pufferfish-gg/Pufferfish@79b9d86 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@a9bdca9 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@9b5f954 Update Simple YAML
pufferfish-gg/Pufferfish@b48e951 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2499975 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@6f42f6f Update readme and use LF because we're not savages
This commit is contained in:
BillyGalbreath
2022-03-22 12:37:21 -05:00
parent b89930ea21
commit 9947768825
12 changed files with 170 additions and 170 deletions

View File

@@ -17,13 +17,13 @@ index 2a8c6da0f9ffa1f94cfd37d1068511c8941d27ce..aa0a081819672c14d9f04c07f4685768
/**
diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
index 0e5decadf31140d6cb121c298f935ccc12c7a7e7..c1fd30fe4cd4eec11eb8298f059d14584b7dd7ec 100644
index 490395f38c4d9977d30a6f48585a4ea0e7faff0f..c944a5a0e60469d42ac435878bda186f2b57b0df 100644
--- a/src/main/java/org/bukkit/entity/Wolf.java
+++ b/src/main/java/org/bukkit/entity/Wolf.java
@@ -39,4 +39,20 @@ public interface Wolf extends Tameable, Sittable {
* @param color the color to apply
@@ -57,4 +57,20 @@ public interface Wolf extends Tameable, Sittable {
*/
public void setCollarColor(@NotNull DyeColor color);
boolean isInterested();
// Paper end
+
+ // Purpur start
+ /**