CraftBukkit
Public
Commits
blablubbabc authored and md_5 committed a0c7bcf02a2
| 48 48 | + |
| 49 49 | + @Override |
| 50 50 | + public Location getLocation() { |
| 51 51 | + return (merchant instanceof EntityVillager) ? ((EntityVillager) this.merchant).getBukkitEntity().getLocation() : null; |
| 52 52 | + } |
| 53 53 | + // CraftBukkit end |
| 54 54 | + |
| 55 55 | public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) { |
| 56 56 | this.itemsInSlots = NonNullList.a(3, ItemStack.a); |
| 57 57 | this.player = entityhuman; |
| 58 + | |
| 59 + | } |
| 60 + | |
| 61 + | public IChatBaseComponent getDisplayName() { |
| 62 + | - return new ChatMessage("mob.villager", new Object[0]); |
| 63 + | + return merchant.getScoreboardDisplayName(); // CraftBukkit |
| 64 + | } |
| 65 + | |
| 66 + | public boolean hasCustomName() { |
| 58 67 | |
| 59 68 | } |
| 60 69 | |
| 61 70 | public int getMaxStackSize() { |
| 62 71 | - return 64; |
| 63 72 | + return maxStack; // CraftBukkit |
| 64 73 | } |
| 65 74 | |
| 66 75 | public boolean a(EntityHuman entityhuman) { |