This only impacted people who used our useSnapshots new API in a plugin, which obviously was no one as the data result was completely broken. Merged the NPE check patch into mine since it has to handle it too.
24 lines
1.2 KiB
Diff
24 lines
1.2 KiB
Diff
From b9462b799af5cf7d7fff939ab35e4d1ef8291b06 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 d567ad4a5..ff5cc74ba 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
|
@@ -206,7 +206,7 @@ public class EntityExperienceOrb extends Entity {
|
|
|
|
public void d(EntityHuman entityhuman) {
|
|
if (!this.world.isClientSide) {
|
|
- if (this.c == 0 && entityhuman.bD == 0) {
|
|
+ if (this.c == 0 && entityhuman.bD == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(((EntityPlayer) entityhuman).getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper
|
|
entityhuman.bD = 2;
|
|
entityhuman.receive(this, 1);
|
|
ItemStack itemstack = EnchantmentManager.b(Enchantments.C, (EntityLiving) entityhuman);
|
|
--
|
|
2.18.0
|
|
|