53 lines
2.5 KiB
Diff
53 lines
2.5 KiB
Diff
|
From d31d8a65355e7a35e0ef7f574607ef6bec23740f Mon Sep 17 00:00:00 2001
|
||
|
|
From: AlphaBlend <whizkid3000@hotmail.com>
|
||
|
|
Date: Thu, 8 Sep 2016 08:48:33 -0700
|
||
|
|
Subject: [PATCH] Add source to PlayerExpChangeEvent
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
||
|
|
index 9da8ae4..11f3b31 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
||
|
|
@@ -172,7 +172,7 @@ public class EntityExperienceOrb extends Entity {
|
||
|
|
}
|
||
|
|
|
||
|
|
if (this.value > 0) {
|
||
|
|
- entityhuman.giveExp(CraftEventFactory.callPlayerExpChangeEvent(entityhuman, this.value).getAmount()); // CraftBukkit - this.value -> event.getAmount()
|
||
|
|
+ entityhuman.giveExp(CraftEventFactory.callPlayerExpChangeEvent(entityhuman, this).getAmount()); // CraftBukkit - this.value -> event.getAmount() // Paper - supply experience orb object
|
||
|
|
}
|
||
|
|
|
||
|
|
this.die();
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
index e7fa96c..777855d 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||
|
|
@@ -44,6 +44,7 @@ import org.bukkit.entity.Player;
|
||
|
|
import org.bukkit.entity.Projectile;
|
||
|
|
import org.bukkit.entity.ThrownExpBottle;
|
||
|
|
import org.bukkit.entity.ThrownPotion;
|
||
|
|
+import org.bukkit.entity.ExperienceOrb; // Paper
|
||
|
|
import org.bukkit.event.Cancellable;
|
||
|
|
import org.bukkit.event.Event;
|
||
|
|
import org.bukkit.event.block.*;
|
||
|
|
@@ -642,6 +643,17 @@ public class CraftEventFactory {
|
||
|
|
return event;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start - Add orb
|
||
|
|
+ public static PlayerExpChangeEvent callPlayerExpChangeEvent(EntityHuman entity, EntityExperienceOrb entityOrb) {
|
||
|
|
+ Player player = (Player) entity.getBukkitEntity();
|
||
|
|
+ ExperienceOrb source = (ExperienceOrb) entityOrb.getBukkitEntity();
|
||
|
|
+ int expAmount = source.getExperience();
|
||
|
|
+ PlayerExpChangeEvent event = new PlayerExpChangeEvent(player, source, expAmount);
|
||
|
|
+ Bukkit.getPluginManager().callEvent(event);
|
||
|
|
+ return event;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
public static boolean handleBlockGrowEvent(World world, int x, int y, int z, net.minecraft.server.Block type, int data) {
|
||
|
|
Block block = world.getWorld().getBlockAt(x, y, z);
|
||
|
|
CraftBlockState state = (CraftBlockState) block.getState();
|
||
|
|
--
|
||
|
|
2.10.2
|
||
|
|
|