Update to Minecraft 1.11

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-11-17 12:41:03 +11:00
parent 49bc1c57f9
commit 4e412ab4e3
279 changed files with 3722 additions and 2992 deletions

View File

@@ -4,16 +4,16 @@
protected void a(MovingObjectPosition movingobjectposition) {
if (!this.world.isClientSide) {
- this.world.triggerEffect(2002, new BlockPosition(this), 0);
- this.world.triggerEffect(2002, new BlockPosition(this), PotionUtil.a(Potions.b));
+ // CraftBukkit - moved to after event
+ // this.world.triggerEffect(2002, new BlockPosition(this), 0);
+ // this.world.triggerEffect(2002, new BlockPosition(this), PotionUtil.a(Potions.b));
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);
+ this.world.triggerEffect(2002, new BlockPosition(this), PotionUtil.a(Potions.b));
+ }
+ // CraftBukkit end
+