mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@57c7aac4 Propagate failures from suggestion futures fixes #13587 (#13598) PaperMC/Paper@fd39dbdb Provide locale pointer for config connection audience (#13600) PaperMC/Paper@a687a82c [ci/skip] chore: remove unneeded task configuration (#13484) PaperMC/Paper@e5718dce fix: PlayerServerFullCheckEvent#deny not setting the allow flag (#13601) PaperMC/Paper@ae0c3a9e Add ItemCraftedEvent (#12245) PaperMC/Paper@581214ad Fix fixClimbingBypassingCramming option (#12793) PaperMC/Paper@0d768aac Add RecipeChoice.ItemTypeChoice (#12049) PaperMC/Paper@e2b76dfd Implement deprecated getItemStack method in ItemTypeRecipeChoice (#13607) PaperMC/Paper@9d303299 Fix pre-tick cooldown reset on swap (#13589) PaperMC/Paper@04739de1 Make SkinSource Player implementation reflect profile changes (#13585) PaperMC/Paper@c59990d9 Update affects spawning api (#13556) PaperMC/Paper@302c47c0 Don't tick disconnected connections (#13614)
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
--- a/src/main/java/org/bukkit/OfflinePlayer.java
|
||||
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
|
||||
@@ -592,4 +_,104 @@
|
||||
default void applySkinToPlayerHeadContents(final PlayerHeadObjectContents.@NonNull Builder builder) {
|
||||
builder.id(this.getUniqueId());
|
||||
@@ -591,4 +_,104 @@
|
||||
default void applySkinToPlayerHeadContents(final PlayerHeadObjectContents.Builder builder) {
|
||||
builder.skin(this.getPlayerProfile());
|
||||
}
|
||||
+
|
||||
+
|
||||
+ // Purpur start - OfflinePlayer API
|
||||
+ /**
|
||||
+ * Determines if the OfflinePlayer is allowed to fly via jump key double-tap like
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -4004,4 +_,123 @@
|
||||
@@ -4012,4 +_,123 @@
|
||||
*/
|
||||
@ApiStatus.Experimental
|
||||
PlayerGameConnection getConnection();
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
--- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
|
||||
@@ -191,6 +_,7 @@
|
||||
public static class ExactChoice implements RecipeChoice {
|
||||
@@ -227,6 +_,7 @@
|
||||
final class ExactChoice implements RecipeChoice {
|
||||
|
||||
private List<ItemStack> choices;
|
||||
+ private Predicate<ItemStack> predicate; // Purpur - Add predicate to recipe's ExactChoice ingredient
|
||||
|
||||
public ExactChoice(@NotNull ItemStack stack) {
|
||||
public ExactChoice(ItemStack stack) {
|
||||
this(Arrays.asList(stack));
|
||||
@@ -241,6 +_,7 @@
|
||||
@@ -275,6 +_,7 @@
|
||||
|
||||
@Override
|
||||
public boolean test(@NotNull ItemStack t) {
|
||||
public boolean test(ItemStack t) {
|
||||
+ if (predicate != null) return predicate.test(t); // Purpur - Add predicate to recipe's ExactChoice ingredient
|
||||
for (ItemStack match : choices) {
|
||||
if (t.isSimilar(match)) {
|
||||
return true;
|
||||
@@ -249,6 +_,17 @@
|
||||
@@ -283,6 +_,17 @@
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user