Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-18 20:40:08 +01:00
Code Issues Projekte Releases Wiki Aktivität

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

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2019-06-07 19:48:12 +10:00
Ursprung 123117bd3a
Commit 7cc7719ffd
1 geänderte Dateien mit 3 neuen und 1 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
Datei anzeigen

@ -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();
} }