Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Fixed villager trade display

Browse Source
This commit is contained in:
Auxilor
2021-04-20 21:29:19 +01:00
parent 6ce0de8db7
commit 0a42320b78
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java
View File

@@ -1,6 +1,7 @@
package com.willfp.eco.spigot.display;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.ListenerPriority;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import com.willfp.eco.core.AbstractPacketAdapter;
@@ -21,7 +22,7 @@ public class PacketOpenWindowMerchant extends AbstractPacketAdapter {
* @param plugin The plugin to listen through.
*/
public PacketOpenWindowMerchant(@NotNull final EcoPlugin plugin) {
super(plugin, PacketType.Play.Server.OPEN_WINDOW_MERCHANT, false);
super(plugin, PacketType.Play.Server.OPEN_WINDOW_MERCHANT, ListenerPriority.MONITOR, true);
}
@Override
@@ -30,9 +31,9 @@ public class PacketOpenWindowMerchant extends AbstractPacketAdapter {
@NotNull final PacketEvent event) {
List<MerchantRecipe> recipes = new ArrayList<>();
for (MerchantRecipe recipe : packet.getMerchantRecipeLists().readSafely(0)) {
for (MerchantRecipe recipe : packet.getMerchantRecipeLists().read(0)) {
MerchantRecipe newRecipe = new MerchantRecipe(
Display.displayAndFinalize(recipe.getResult()),
Display.display(recipe.getResult().clone()),
recipe.getUses(),
recipe.getMaxUses(),
recipe.hasExperienceReward(),
@@ -41,7 +42,7 @@ public class PacketOpenWindowMerchant extends AbstractPacketAdapter {
);
for (ItemStack ingredient : recipe.getIngredients()) {
newRecipe.addIngredient(Display.displayAndFinalize(ingredient));
newRecipe.addIngredient(Display.display(ingredient.clone()));
}
recipes.add(newRecipe);
}