OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-24 18:07:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-5037: Player.openMerchant does not show merchant level

Browse source
This commit is contained in:
md_5 2019-06-07 19:48:12 +10:00
parent 123117bd3a
commit 7cc7719ffd
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View file

@ -596,9 +596,11 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
IMerchant mcMerchant; IMerchant mcMerchant;
IChatBaseComponent name; IChatBaseComponent name;
int level = 0;
if (merchant instanceof CraftVillager) { if (merchant instanceof CraftVillager) {
mcMerchant = ((CraftVillager) merchant).getHandle(); mcMerchant = ((CraftVillager) merchant).getHandle();
name = ((CraftVillager) merchant).getHandle().getScoreboardDisplayName(); name = ((CraftVillager) merchant).getHandle().getScoreboardDisplayName();
level = ((CraftVillager) merchant).getHandle().getVillagerData().getLevel();
} else if (merchant instanceof CraftMerchantCustom) { } else if (merchant instanceof CraftMerchantCustom) {
mcMerchant = ((CraftMerchantCustom) merchant).getMerchant(); mcMerchant = ((CraftMerchantCustom) merchant).getMerchant();
name = ((CraftMerchantCustom) merchant).getMerchant().getScoreboardDisplayName(); name = ((CraftMerchantCustom) merchant).getMerchant().getScoreboardDisplayName();
@ -607,7 +609,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
} }
mcMerchant.setTradingPlayer(this.getHandle()); mcMerchant.setTradingPlayer(this.getHandle());
mcMerchant.openTrade(this.getHandle(), name, 0); mcMerchant.openTrade(this.getHandle(), name, level);
return this.getHandle().activeContainer.getBukkitView(); return this.getHandle().activeContainer.getBukkitView();
} }