mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-22 12:54:49 +02:00
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
80 lines
3.4 KiB
Diff
80 lines
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 15 May 2021 22:11:11 -0700
|
|
Subject: [PATCH] ItemStack repair check API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
index 35484b3ad8a767b4d74ca926d9d8610d142624a1..5cb6fe52514a94eeda2676659f1a990071befecd 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
|
@@ -538,6 +538,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
|
return io.papermc.paper.inventory.ItemRarity.values()[getItem(itemStack.getType()).getRarity(CraftItemStack.asNMSCopy(itemStack)).ordinal()];
|
|
}
|
|
|
|
+ @Override
|
|
+ public boolean isValidRepairItemStack(org.bukkit.inventory.ItemStack itemToBeRepaired, org.bukkit.inventory.ItemStack repairMaterial) {
|
|
+ if (!itemToBeRepaired.getType().isItem() || !repairMaterial.getType().isItem()) {
|
|
+ return false;
|
|
+ }
|
|
+ return CraftMagicNumbers.getItem(itemToBeRepaired.getType()).isValidRepairItem(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
|
|
+ }
|
|
+
|
|
@Override
|
|
public int getProtocolVersion() {
|
|
return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
|
|
diff --git a/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java b/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..6b8d360ef86e181a680ad77f28b7dd7368dddfe7
|
|
--- /dev/null
|
|
+++ b/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java
|
|
@@ -0,0 +1,48 @@
|
|
+package io.papermc.paper.util;
|
|
+
|
|
+import org.bukkit.Material;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.bukkit.support.AbstractTestingBase;
|
|
+import org.junit.jupiter.api.Test;
|
|
+
|
|
+import static org.junit.jupiter.api.Assertions.assertFalse;
|
|
+import static org.junit.jupiter.api.Assertions.assertThrows;
|
|
+import static org.junit.jupiter.api.Assertions.assertTrue;
|
|
+
|
|
+public class ItemStackRepairCheckTest extends AbstractTestingBase {
|
|
+
|
|
+ @Test
|
|
+ public void testIsRepariableBy() {
|
|
+ ItemStack diamondPick = new ItemStack(Material.DIAMOND_PICKAXE);
|
|
+
|
|
+ assertTrue(diamondPick.isRepairableBy(new ItemStack(Material.DIAMOND)), "diamond pick isn't repairable by a diamond");
|
|
+ }
|
|
+
|
|
+ @Test
|
|
+ public void testCanRepair() {
|
|
+ ItemStack diamond = new ItemStack(Material.DIAMOND);
|
|
+
|
|
+ assertTrue(diamond.canRepair(new ItemStack(Material.DIAMOND_AXE)), "diamond can't repair a diamond axe");
|
|
+ }
|
|
+
|
|
+ @Test
|
|
+ public void testIsNotRepairableBy() {
|
|
+ ItemStack notDiamondPick = new ItemStack(Material.ACACIA_SAPLING);
|
|
+
|
|
+ assertFalse(notDiamondPick.isRepairableBy(new ItemStack(Material.DIAMOND)), "acacia sapling is repairable by a diamond");
|
|
+ }
|
|
+
|
|
+ @Test
|
|
+ public void testCanNotRepair() {
|
|
+ ItemStack diamond = new ItemStack(Material.DIAMOND);
|
|
+
|
|
+ assertFalse(diamond.canRepair(new ItemStack(Material.OAK_BUTTON)), "diamond can repair oak button");
|
|
+ }
|
|
+
|
|
+ @Test
|
|
+ public void testInvalidItem() {
|
|
+ ItemStack badItemStack = new ItemStack(Material.ACACIA_WALL_SIGN);
|
|
+
|
|
+ assertFalse(badItemStack.isRepairableBy(new ItemStack(Material.DIAMOND)), "acacia wall sign is repairable by diamond");
|
|
+ }
|
|
+}
|