forked from Brandon/MythicNetwork
23 lines
995 B
Diff
23 lines
995 B
Diff
|
--- a/net/minecraft/server/EntityThrownExpBottle.java
|
||
|
|
+++ b/net/minecraft/server/EntityThrownExpBottle.java
|
||
|
|
@@ -28,9 +28,18 @@
|
||
|
|
|
||
|
|
protected void a(MovingObjectPosition movingobjectposition) {
|
||
|
|
if (!this.world.isClientSide) {
|
||
|
|
- this.world.triggerEffect(2002, new BlockPosition(this), 0);
|
||
|
|
+ // CraftBukkit - moved to after event
|
||
|
|
+ // this.world.triggerEffect(2002, new BlockPosition(this), 0);
|
||
|
|
int i = 3 + this.world.random.nextInt(5) + this.world.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.world.triggerEffect(2002, new BlockPosition(this), 0);
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
+
|
||
|
|
while (i > 0) {
|
||
|
|
int j = EntityExperienceOrb.getOrbValue(i);
|
||
|
|
|