Paper/Spigot-Server-Patches/0170-Add-source-to-PlayerExpChangeEvent.patch

53 lines
2.5 KiB
Diff
Raw Normal View History

2018-01-11 06:31:19 +01:00
From d98b0708ee4ce659c39c41e8280b1afe41be7a05 Mon Sep 17 00:00:00 2001
2016-12-01 00:31:46 +01:00
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
2018-01-11 06:31:19 +01:00
index eae70636..bf5f1f0e 100644
2016-12-01 00:31:46 +01:00
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
2017-11-24 08:14:38 +01:00
@@ -178,7 +178,7 @@ public class EntityExperienceOrb extends Entity {
}
2016-12-01 00:31:46 +01:00
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
2018-01-11 06:31:19 +01:00
index ba7e5d18..87b4e918 100644
2016-12-01 00:31:46 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
2017-11-24 08:14:38 +01:00
@@ -46,6 +46,7 @@ import org.bukkit.entity.Player;
2016-12-01 00:31:46 +01:00
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.*;
2017-11-24 08:14:38 +01:00
@@ -656,6 +657,17 @@ public class CraftEventFactory {
2016-12-01 00:31:46 +01:00
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();
--
2018-01-11 06:31:19 +01:00
2.14.3
2016-12-01 00:31:46 +01:00