mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-26 10:29:13 +00:00
Updated Upstream (Paper/Gale)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f4f27551 [ci/skip] Clarify BlockFadeEvent#getNewState javadocs (#12250) PaperMC/Paper@102c8bbc Add config for updating equipment on player actions (#12275) PaperMC/Paper@f0388e2f Call EntityPushedByEntityAttackEvent for Mace AoE (#12257) PaperMC/Paper@c37b890c More deferred requireNonNull message creation PaperMC/Paper@310f5229 Add unsupported config option and internal API to simplify remote item matching PaperMC/Paper@6ea42025 Send all attributes on respawn (#12274) PaperMC/Paper@2d3a1385 [ci/skip] Refine recipe management API documentation. (#12287) PaperMC/Paper@aaaeb4e1 [ci/skip] Make compilation logs actually readable (#12276) PaperMC/Paper@bb1beda6 feat: add event to wind charge explode (#12248) Gale Changes: Dreeam-qwq/Gale@43bfa513 Updated Upstream (Paper) Dreeam-qwq/Gale@ab0a7189 Updated Upstream () Dreeam-qwq/Gale@27ddb2fa [ci/skip] Added merge announcement Dreeam-qwq/Gale@523e7745 [ci/skip] Fix announcement format Dreeam-qwq/Gale@d91ed070 [ci/skip] Update annocement
This commit is contained in:
@@ -61,14 +61,10 @@ public class ItemStackStripper {
|
||||
* Check if two ItemStacks are the same after stripping components
|
||||
*/
|
||||
public static boolean matchesStripped(ItemStack left, ItemStack right) {
|
||||
if (HideItemComponent.enabled) {
|
||||
return left == right || (
|
||||
left.is(right.getItem()) && left.getCount() == right.getCount() &&
|
||||
(left.isEmpty() && right.isEmpty() || Objects.equals(strip(left.getComponents()), strip(right.getComponents())))
|
||||
);
|
||||
}
|
||||
|
||||
return ItemStack.matches(left, right);
|
||||
return left == right || (
|
||||
left.is(right.getItem()) && left.getCount() == right.getCount() &&
|
||||
(left.isEmpty() && right.isEmpty() || Objects.equals(strip(left.getComponents()), strip(right.getComponents())))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user