mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 11:44:19 +01:00
43702a9e10
By: md_5 <git@md-5.net>
22 lines
1.2 KiB
Diff
22 lines
1.2 KiB
Diff
--- a/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
|
|
+++ b/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
|
|
@@ -39,9 +39,18 @@
|
|
protected void onHit(MovingObjectPosition movingobjectposition) {
|
|
super.onHit(movingobjectposition);
|
|
if (this.level instanceof WorldServer) {
|
|
- this.level.levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
|
|
+ // CraftBukkit - moved to after event
|
|
+ // this.level.levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
|
|
int i = 3 + this.level.random.nextInt(5) + this.level.random.nextInt(5);
|
|
|
|
+ // CraftBukkit start
|
|
+ org.bukkit.event.entity.ExpBottleEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExpBottleEvent(this, i);
|
|
+ i = event.getExperience();
|
|
+ if (event.getShowEffect()) {
|
|
+ this.level.levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
EntityExperienceOrb.award((WorldServer) this.level, this.position(), i);
|
|
this.discard();
|
|
}
|