Skip to content

Update Villager Prices before opening inventory to Player using API #13906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Doc94 wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −9
Open

Update Villager Prices before opening inventory to Player using API #13906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build-data/paper.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@ public net.minecraft.world.entity.npc.villager.Villager numberOfRestocksToday
public net.minecraft.world.entity.npc.villager.Villager releaseAllPois()V
public net.minecraft.world.entity.npc.villager.Villager setUnhappy()V
public net.minecraft.world.entity.npc.villager.Villager updateDemand()V
public net.minecraft.world.entity.npc.villager.Villager updateSpecialPrices(Lnet/minecraft/world/entity/player/Player;)V
public net.minecraft.world.entity.npc.wanderingtrader.WanderingTrader getWanderTarget()Lnet/minecraft/core/BlockPos;
public net.minecraft.world.entity.player.Abilities flyingSpeed
public net.minecraft.world.entity.player.Abilities walkingSpeed
Expand Down
19 changes: 10 additions & 9 deletions paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,17 +512,18 @@ public InventoryView openMerchant(Merchant merchant, boolean force) {
net.minecraft.world.item.trading.Merchant mcMerchant;
Component name;
int level = 1; // note: using level 0 with active 'is-regular-villager'-flag allows hiding the name suffix
if (merchant instanceof CraftAbstractVillager) {
mcMerchant = ((CraftAbstractVillager) merchant).getHandle();
name = ((CraftAbstractVillager) merchant).getHandle().getDisplayName();
if (merchant instanceof CraftVillager) {
level = ((CraftVillager) merchant).getHandle().getVillagerData().level();
if (merchant instanceof CraftAbstractVillager craftAbstractVillager) {
mcMerchant = craftAbstractVillager.getHandle();
name = craftAbstractVillager.getHandle().getDisplayName();
if (merchant instanceof CraftVillager craftVillager) {
level = craftVillager.getHandle().getVillagerData().level();
craftVillager.getHandle().updateSpecialPrices(this.getHandle()); // Update villager prices before to open to player
}
} else if (merchant instanceof CraftMerchantCustom) {
mcMerchant = ((CraftMerchantCustom) merchant).getMerchant();
name = ((CraftMerchantCustom) merchant).getMerchant().getScoreboardDisplayName();
} else if (merchant instanceof CraftMerchantCustom craftMerchantCustom) {
mcMerchant = craftMerchantCustom.getMerchant();
name = craftMerchantCustom.getMerchant().getScoreboardDisplayName();
} else {
throw new IllegalArgumentException("Can't open merchant " + merchant.toString());
throw new IllegalArgumentException("Can't open merchant " + merchant);
}

mcMerchant.setTradingPlayer(this.getHandle());
Expand Down
1 change: 1 addition & 0 deletions paper-server/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftMenus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public static void openMerchantMenu(final ServerPlayer player, final MerchantMen
int level = 1;
if (minecraftMerchant instanceof final Villager villager) {
level = villager.getVillagerData().level();
villager.updateSpecialPrices(player); // Update villager prices before to open to player
}

if (minecraftMerchant.getTradingPlayer() != null) { // merchant's can only have one trader
Expand Down
Loading