37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
--- a/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
|
|
+++ b/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
|
|
@@ -10,6 +10,10 @@
|
|
import net.minecraft.world.level.World;
|
|
import net.minecraft.world.phys.MovingObjectPosition;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityThrownExpBottle extends EntityProjectileThrowable {
|
|
|
|
public EntityThrownExpBottle(EntityTypes<? extends EntityThrownExpBottle> entitytypes, World world) {
|
|
@@ -38,11 +42,20 @@
|
|
protected void onHit(MovingObjectPosition movingobjectposition) {
|
|
super.onHit(movingobjectposition);
|
|
if (this.level() instanceof WorldServer) {
|
|
- this.level().levelEvent(2002, this.blockPosition(), -13083194);
|
|
+ // CraftBukkit - moved to after event
|
|
+ // this.level().levelEvent(2002, this.blockPosition(), -13083194);
|
|
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, movingobjectposition, i);
|
|
+ i = event.getExperience();
|
|
+ if (event.getShowEffect()) {
|
|
+ this.level().levelEvent(2002, this.blockPosition(), -13083194);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
EntityExperienceOrb.award((WorldServer) this.level(), this.position(), i);
|
|
- this.discard();
|
|
+ this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
|
|
}
|
|
|
|
}
|