Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 20:46:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix CraftInventoryMerchant#getSelectedRecipe if there is no active merchant recipe.

Browse Source
This commit is contained in:
blablubbabc 2019-02-21 03:06:11 +01:00 committed by md_5
parent c24abab787
commit 14cd1688da
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryMerchant.java
View File

@ -17,7 +17,8 @@ public class CraftInventoryMerchant extends CraftInventory implements MerchantIn
@Override @Override
public MerchantRecipe getSelectedRecipe() { public MerchantRecipe getSelectedRecipe() {
return getInventory().getRecipe().asBukkit(); net.minecraft.server.MerchantRecipe nmsRecipe = getInventory().getRecipe();
return (nmsRecipe == null) ? null : nmsRecipe.asBukkit();
} }
@Override @Override