Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #374 from Project-Cepi/vanillaStackingRuleEquals

Browse Source 
Add #equals method to VanillaStackingRule
This commit is contained in:
TheMode 2021-07-20 20:09:15 +02:00 committed by GitHub
commit 7944977cd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minestom/server/item/ItemStack.java
View File

@ -31,6 +31,8 @@ public final class ItemStack implements TagReadable, HoverEventSource<HoverEvent
*/ */
public static final @NotNull ItemStack AIR = ItemStack.of(Material.AIR); public static final @NotNull ItemStack AIR = ItemStack.of(Material.AIR);
private static final @NotNull VanillaStackingRule DEFAULT_STACKING_RULE = new VanillaStackingRule();
private final StackingRule stackingRule; private final StackingRule stackingRule;
private final Material material; private final Material material;
@ -43,7 +45,7 @@ public final class ItemStack implements TagReadable, HoverEventSource<HoverEvent
this.material = material; this.material = material;
this.amount = amount; this.amount = amount;
this.meta = meta; this.meta = meta;
this.stackingRule = Objects.requireNonNullElseGet(stackingRule, VanillaStackingRule::new); this.stackingRule = Objects.requireNonNullElse(stackingRule, DEFAULT_STACKING_RULE);
} }
@Contract(value = "_ -> new", pure = true) @Contract(value = "_ -> new", pure = true)

7
src/main/java/net/minestom/server/item/rule/VanillaStackingRule.java
View File

@ -33,4 +33,11 @@ public class VanillaStackingRule implements StackingRule {
public int getMaxSize(@NotNull ItemStack itemStack) { public int getMaxSize(@NotNull ItemStack itemStack) {
return itemStack.getMaterial().getMaxDefaultStackSize(); return itemStack.getMaterial().getMaxDefaultStackSize();
} }
@Override
public boolean equals(Object obj) {
if (this == obj) return true;
return obj != null && getClass() == obj.getClass();
}
} }