Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 17:07:34 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants

Browse Source
This commit is contained in:
blablubbabc 2019-06-21 05:06:16 +02:00 committed by md_5
parent 9af900778d
commit 6dde4b9fda
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View File

@ -596,11 +596,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
IMerchant mcMerchant; IMerchant mcMerchant;
IChatBaseComponent name; IChatBaseComponent name;
int level = 0; int level = 1; // note: using level 0 with active 'is-regular-villager'-flag allows hiding the name suffix
if (merchant instanceof CraftVillager) { if (merchant instanceof CraftAbstractVillager) {
mcMerchant = ((CraftVillager) merchant).getHandle(); mcMerchant = ((CraftAbstractVillager) merchant).getHandle();
name = ((CraftVillager) merchant).getHandle().getScoreboardDisplayName(); name = ((CraftAbstractVillager) merchant).getHandle().getScoreboardDisplayName();
level = ((CraftVillager) merchant).getHandle().getVillagerData().getLevel(); if (merchant instanceof CraftVillager) {
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();

2
src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
View File

@ -95,7 +95,7 @@ public class CraftMerchantCustom extends CraftMerchant {
@Override @Override
public boolean eb() { public boolean eb() {
return true; return false; // is-regular-villager flag (hides some gui elements: xp bar, name suffix)
} }
@Override @Override