From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Thu, 2 Jul 2020 16:12:10 -0700 Subject: [PATCH] added PlayerTradeEvent diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java index 73ceb0f14610fe1d4d55542dad957b1fdf9f8e04..eb5c3a1f0d9ff665631caf5bf579e83d1ed25e4f 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -25,7 +25,7 @@ import org.bukkit.event.entity.EntityUnleashEvent.UnleashReason; public abstract class EntityInsentient extends EntityLiving { private static final DataWatcherObject b = DataWatcher.a(EntityInsentient.class, DataWatcherRegistry.a); - public int e; + public int e;public void setAmbientSoundTime(int time) { this.e = time; } // Paper - OBFHELPER protected int f; protected ControllerLook lookController; protected ControllerMove moveController; @@ -227,6 +227,7 @@ public abstract class EntityInsentient extends EntityLiving { this.datawatcher.register(EntityInsentient.b, (byte) 0); } + public int getAmbientSoundInterval() { return D(); } // Paper - OBFHELPER public int D() { return 80; } diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java index 8971dd013498e70c4e7a6ac6a218f62e599c86b9..b2a76db173ae12bff2e8a7de411cb489fdb2e9c7 100644 --- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java +++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java @@ -11,6 +11,9 @@ import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; import org.bukkit.entity.AbstractVillager; import org.bukkit.event.entity.VillagerAcquireTradeEvent; // CraftBukkit end +// Paper start +import io.papermc.paper.event.player.PlayerTradeEvent; +// Paper end public abstract class EntityVillagerAbstract extends EntityAgeable implements NPC, IMerchant { @@ -107,16 +110,27 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP @Override public void a(MerchantRecipe merchantrecipe) { - merchantrecipe.increaseUses(); - this.e = -this.D(); - this.b(merchantrecipe); + // Paper - moved down + // Paper start if (this.tradingPlayer instanceof EntityPlayer) { - CriterionTriggers.s.a((EntityPlayer) this.tradingPlayer, this, merchantrecipe.getSellingItem()); + PlayerTradeEvent event = new PlayerTradeEvent(((EntityPlayer) this.tradingPlayer).getBukkitEntity(), (AbstractVillager) this.getBukkitEntity(), merchantrecipe.asBukkit(), true, true); + event.callEvent(); + if (!event.isCancelled()) { + MerchantRecipe recipe = CraftMerchantRecipe.fromBukkit(event.getTrade()).toMinecraft(); + if (event.willIncreaseTradeUses()) recipe.increaseUses(); + this.setAmbientSoundTime(-getAmbientSoundInterval()); + if (event.isRewardingExp()) this.rewardTradeXp(recipe); + CriterionTriggers.s.a((EntityPlayer) this.tradingPlayer, this, recipe.getSellingItem()); + } + } else { + merchantrecipe.increaseUses(); + this.setAmbientSoundTime(-getAmbientSoundInterval()); + this.rewardTradeXp(merchantrecipe); } - + // Paper end } - protected abstract void b(MerchantRecipe merchantrecipe); + protected abstract void b(MerchantRecipe merchantrecipe); public void rewardTradeXp(MerchantRecipe merchantrecipe) { this.b(merchantrecipe); } // Paper - OBFHELPER @Override public boolean isRegularVillager() {