2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
|
|
|
|
+++ b/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
|
2021-06-11 07:00:00 +02:00
|
|
|
@@ -39,9 +39,18 @@
|
2021-11-21 23:00:00 +01:00
|
|
|
protected void onHit(MovingObjectPosition movingobjectposition) {
|
|
|
|
super.onHit(movingobjectposition);
|
2023-06-07 17:30:00 +02:00
|
|
|
if (this.level() instanceof WorldServer) {
|
|
|
|
- this.level().levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit - moved to after event
|
2023-06-07 17:30:00 +02:00
|
|
|
+ // this.level().levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
|
|
|
|
int i = 3 + this.level().random.nextInt(5) + this.level().random.nextInt(5);
|
2015-02-26 23:41:06 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start
|
2023-10-25 09:54:07 +02:00
|
|
|
+ org.bukkit.event.entity.ExpBottleEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExpBottleEvent(this, movingobjectposition, i);
|
2014-11-25 22:32:16 +01:00
|
|
|
+ i = event.getExperience();
|
|
|
|
+ if (event.getShowEffect()) {
|
2023-06-07 17:30:00 +02:00
|
|
|
+ this.level().levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
|
2014-11-25 22:32:16 +01:00
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
2015-02-26 23:41:06 +01:00
|
|
|
+
|
2023-06-07 17:30:00 +02:00
|
|
|
EntityExperienceOrb.award((WorldServer) this.level(), this.position(), i);
|
2021-11-21 23:00:00 +01:00
|
|
|
this.discard();
|
2021-06-11 07:00:00 +02:00
|
|
|
}
|