mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-04 02:34:48 +02:00
aba4969668
Upstream has released updates that appears 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: e970fd72 Remove incorrect javadoc from TargetReason 84df6df1 SPIGOT-5282: Improve bucket event API CraftBukkit Changes:b2bcde89SPIGOT-5258: TNT Not Moving Players in Creative Mode44d675adSPIGOT-5263: Chests stay open after InventoryOpenEvent cancelled.2439178eSPIGOT-5278: EntityDrowned memory leak7055c931SPIGOT-5264: Call event for experience orbs losing their target49141172SPIGOT-5282: Improve bucket event API6bbb3b04SPIGOT-5281: Clearer error messages for ChunkSnapshot misuse
24 lines
1.2 KiB
Diff
24 lines
1.2 KiB
Diff
From 0b8205b527e5acfa6d114903d7f2c5f322871e34 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 19 Dec 2017 22:02:53 -0500
|
|
Subject: [PATCH] PlayerPickupExperienceEvent
|
|
|
|
Allows plugins to cancel a player picking up an experience orb
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
|
index 35f03947d..e6b810756 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
|
@@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity {
|
|
@Override
|
|
public void pickup(EntityHuman entityhuman) {
|
|
if (!this.world.isClientSide) {
|
|
- if (this.d == 0 && entityhuman.bF == 0) {
|
|
+ if (this.d == 0 && entityhuman.bF == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(((EntityPlayer) entityhuman).getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper
|
|
entityhuman.bF = 2;
|
|
entityhuman.receive(this, 1);
|
|
Entry<EnumItemSlot, ItemStack> entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman);
|
|
--
|
|
2.23.0
|
|
|