Fix max duration for modded items (#660)
This commit is contained in:
parent
1df61665ce
commit
dbb2358985
|
@ -36,6 +36,7 @@ import org.bukkit.craftbukkit.v.inventory.CraftMetaSkull;
|
||||||
import org.bukkit.craftbukkit.v.inventory.CraftMetaSpawnEgg;
|
import org.bukkit.craftbukkit.v.inventory.CraftMetaSpawnEgg;
|
||||||
import org.bukkit.craftbukkit.v.inventory.CraftMetaSuspiciousStew;
|
import org.bukkit.craftbukkit.v.inventory.CraftMetaSuspiciousStew;
|
||||||
import org.bukkit.craftbukkit.v.inventory.CraftMetaTropicalFishBucket;
|
import org.bukkit.craftbukkit.v.inventory.CraftMetaTropicalFishBucket;
|
||||||
|
import org.bukkit.craftbukkit.v.util.CraftMagicNumbers;
|
||||||
import org.bukkit.craftbukkit.v.util.CraftNamespacedKey;
|
import org.bukkit.craftbukkit.v.util.CraftNamespacedKey;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
import org.bukkit.material.MaterialData;
|
import org.bukkit.material.MaterialData;
|
||||||
|
@ -218,6 +219,13 @@ public abstract class MaterialMixin implements MaterialBridge {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Inject(method = "getMaxDurability", cancellable = true, at = @At("HEAD"))
|
||||||
|
private void arclight$getMaxDurability(CallbackInfoReturnable<Integer> cir) {
|
||||||
|
if (arclight$spec != null) {
|
||||||
|
cir.setReturnValue(arclight$spec.maxDurability);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public MaterialPropertySpec bridge$getSpec() {
|
public MaterialPropertySpec bridge$getSpec() {
|
||||||
return arclight$spec;
|
return arclight$spec;
|
||||||
|
@ -342,6 +350,10 @@ public abstract class MaterialMixin implements MaterialBridge {
|
||||||
if (arclight$spec.blastResistance == null) {
|
if (arclight$spec.blastResistance == null) {
|
||||||
arclight$spec.blastResistance = block != null ? block.getExplosionResistance() : 0;
|
arclight$spec.blastResistance = block != null ? block.getExplosionResistance() : 0;
|
||||||
}
|
}
|
||||||
|
if (arclight$spec.craftingRemainingItem == null) {
|
||||||
|
// noinspection deprecation
|
||||||
|
arclight$spec.craftingRemainingItem = item != null && item.hasCraftingRemainingItem() ? CraftMagicNumbers.getMaterial(item.getCraftingRemainingItem()).name() : null;
|
||||||
|
}
|
||||||
if (arclight$spec.itemMetaType == null) {
|
if (arclight$spec.itemMetaType == null) {
|
||||||
arclight$spec.itemMetaType = "UNSPECIFIC";
|
arclight$spec.itemMetaType = "UNSPECIFIC";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user