mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 02:55:47 +01:00
ea0ec8c5a0
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: e9ce88b9 SPIGOT-6562: Add more specific sculk sensor event CraftBukkit Changes: d7ef1e91 SPIGOT-6558: Attempt to improve SkullMeta e7a63287 SPIGOT-6562: Add more specific sculk sensor event
47 lines
2.6 KiB
Diff
47 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alexander <protonull@protonmail.com>
|
|
Date: Thu, 6 May 2021 13:01:25 +0100
|
|
Subject: [PATCH] Have CraftMerchantCustom emit PlayerPurchaseEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
|
|
index f40d6a0048ad5b3f6e31d83894ee89f5ca64fb3a..56a04cfdedfbc34be686304fc2dde59f1707d282 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
|
|
@@ -81,6 +81,35 @@ public class CraftMerchantCustom extends CraftMerchant {
|
|
|
|
@Override
|
|
public void notifyTrade(MerchantOffer offer) {
|
|
+ // Paper start
|
|
+ /** Based on {@link net.minecraft.world.entity.npc.EntityVillagerAbstract#b(MerchantRecipe)} */
|
|
+ if (getTradingPlayer() instanceof net.minecraft.server.level.ServerPlayer) {
|
|
+ final net.minecraft.server.level.ServerPlayer trader = (net.minecraft.server.level.ServerPlayer) getTradingPlayer();
|
|
+ final io.papermc.paper.event.player.PlayerPurchaseEvent event = new io.papermc.paper.event.player.PlayerPurchaseEvent(
|
|
+ trader.getBukkitEntity(),
|
|
+ offer.asBukkit(),
|
|
+ false, // reward xp?
|
|
+ true); // should increase uses?
|
|
+ event.callEvent();
|
|
+ if (event.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ final org.bukkit.inventory.MerchantRecipe eventTrade = event.getTrade();
|
|
+ if (event.willIncreaseTradeUses()) {
|
|
+ eventTrade.setUses(eventTrade.getUses() + 1);
|
|
+ }
|
|
+ if (event.isRewardingExp() && eventTrade.hasExperienceReward()) {
|
|
+ /** Based on {@link net.minecraft.world.entity.npc.EntityVillagerTrader#b(MerchantRecipe)} */
|
|
+ final int xp = 3 + net.minecraft.world.entity.Entity.SHARED_RANDOM.nextInt(4);
|
|
+ final Level world = trader.getCommandSenderWorld();
|
|
+ world.addFreshEntity(new net.minecraft.world.entity.ExperienceOrb(
|
|
+ world, trader.getX(), trader.getY() + 0.5d, trader.getZ(), xp,
|
|
+ org.bukkit.entity.ExperienceOrb.SpawnReason.VILLAGER_TRADE, trader, null));
|
|
+ }
|
|
+ return;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
// increase recipe's uses
|
|
offer.increaseUses();
|
|
}
|