OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-10 03:52:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
By: blablubbabc <lukas@wirsindwir.de>
This commit is contained in:
CraftBukkit/Spigot 2019-02-21 03:06:11 +01:00
parent 961fc0efe5
commit 4d93e94dbd
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryMerchant.java
View file

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