3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-29 17:40:09 +01:00
Paper/nms-patches/EntityThrownExpBottle.patch

23 Zeilen
1.1 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityThrownExpBottle.java
+++ b/net/minecraft/server/EntityThrownExpBottle.java
2019-04-23 04:00:00 +02:00
@@ -27,9 +27,18 @@
@Override
protected void a(MovingObjectPosition movingobjectposition) {
2015-02-26 23:41:06 +01:00
if (!this.world.isClientSide) {
2019-05-27 22:30:00 +02:00
- this.world.triggerEffect(2002, new BlockPosition(this), PotionUtil.a(Potions.WATER));
+ // CraftBukkit - moved to after event
2019-05-27 22:30:00 +02:00
+ // this.world.triggerEffect(2002, new BlockPosition(this), PotionUtil.a(Potions.WATER));
2015-02-26 23:41:06 +01:00
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()) {
2019-05-27 22:30:00 +02:00
+ this.world.triggerEffect(2002, new BlockPosition(this), PotionUtil.a(Potions.WATER));
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
while (i > 0) {
int j = EntityExperienceOrb.getOrbValue(i);
2015-02-26 23:41:06 +01:00