Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 11:38:29 +01:00
Code Issues Projects Releases Wiki Activity

[Bleeding] Implement ExpBottleEvent; Addresses BUKKIT-888

Browse Source
This commit is contained in:
Wesley Wolfe 2012-03-20 02:07:13 -05:00 committed by EvilSeph
parent 9055a20d71
commit 68b98d4c8f
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/minecraft/server/EntityThrownExpBottle.java
View File

@ -28,9 +28,18 @@ public class EntityThrownExpBottle extends EntityProjectile {
protected void a(MovingObjectPosition movingobjectposition) { protected void a(MovingObjectPosition movingobjectposition) {
if (!this.world.isStatic) { if (!this.world.isStatic) {
this.world.triggerEffect(2002, (int) Math.round(this.locX), (int) Math.round(this.locY), (int) Math.round(this.locZ), 0); // CraftBukkit moved after event
//this.world.triggerEffect(2002, (int) Math.round(this.locX), (int) Math.round(this.locY), (int) Math.round(this.locZ), 0);
int i = 3 + this.world.random.nextInt(5) + this.world.random.nextInt(5); 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, (int) Math.round(this.locX), (int) Math.round(this.locY), (int) Math.round(this.locZ), 0);
}
// CraftBukkit end
while (i > 0) { while (i > 0) {
int j = EntityExperienceOrb.getOrbValue(i); int j = EntityExperienceOrb.getOrbValue(i);

8
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -46,6 +46,7 @@ import org.bukkit.entity.Pig;
import org.bukkit.entity.PigZombie; import org.bukkit.entity.PigZombie;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile; import org.bukkit.entity.Projectile;
import org.bukkit.entity.ThrownExpBottle;
import org.bukkit.entity.ThrownPotion; import org.bukkit.entity.ThrownPotion;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.block.*; import org.bukkit.event.block.*;
@ -498,4 +499,11 @@ public class CraftEventFactory {
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
return event; return event;
} }
public static ExpBottleEvent callExpBottleEvent(Entity entity, int exp) {
ThrownExpBottle bottle = (ThrownExpBottle) entity.getBukkitEntity();
ExpBottleEvent event = new ExpBottleEvent(bottle, exp);
Bukkit.getPluginManager().callEvent(event);
return event;
}
} }