From 340908d328f7f26c377ceacd8b964b37973b1260 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 May 2018 19:40:33 -0400 Subject: [PATCH] Fix Reason = Player for Experience Orb drop --- ...perienceOrbs-API-for-Reason-Source-Triggering-play.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 0a7dfa7402..4e445c7f5c 100644 --- a/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 595f30a5ba443cbbad054e480a9cd909e56c02b8 Mon Sep 17 00:00:00 2001 +From 1e93cb2d271ea70f82389d69c55179ba9a2edca0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -129,7 +129,7 @@ index 6ac89d1e3..177d8582f 100644 // CraftBukkit end Item item = itemstack.getItem(); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 9e864864d..91e8c1d75 100644 +index 9e864864d..38c043375 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -347,7 +347,8 @@ public abstract class EntityLiving extends Entity { @@ -138,7 +138,7 @@ index 9e864864d..91e8c1d75 100644 i -= j; - this.world.addEntity(new EntityExperienceOrb(this.world, this.locX, this.locY, this.locZ, j)); + EntityLiving attacker = killer != null ? killer : lastDamager; // Paper -+ this.world.addEntity(new EntityExperienceOrb(this.world, this.locX, this.locY, this.locZ, j, this instanceof Player ? org.bukkit.entity.ExperienceOrb.SpawnReason.PLAYER_DEATH : org.bukkit.entity.ExperienceOrb.SpawnReason.ENTITY_DEATH, attacker, this)); // Paper ++ this.world.addEntity(new EntityExperienceOrb(this.world, this.locX, this.locY, this.locZ, j, this instanceof EntityPlayer ? org.bukkit.entity.ExperienceOrb.SpawnReason.PLAYER_DEATH : org.bukkit.entity.ExperienceOrb.SpawnReason.ENTITY_DEATH, attacker, this)); // Paper } this.expToDrop = 0; // CraftBukkit end