SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.8

Browse Source 
For more information please see http://www.spigotmc.org/

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2014-11-26 08:32:16 +11:00
parent 2f44d66966
commit a419776f3c
347 changed files with 22151 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
paper-server/nms-patches/EntityThrownExpBottle.patch Normal file
View File

@@ -0,0 +1,22 @@
--- ../work/decompile-bb26c12b/net/minecraft/server/EntityThrownExpBottle.java 2014-11-27 08:59:46.737421688 +1100
+++ src/main/java/net/minecraft/server/EntityThrownExpBottle.java 2014-11-27 08:42:10.112850989 +1100
@@ -28,8 +28,17 @@
protected void a(MovingObjectPosition movingobjectposition) {
if (!this.world.isStatic) {
- this.world.triggerEffect(2002, new BlockPosition(this), 0);
- int i = 3 + this.world.random.nextInt(5) + this.world.random.nextInt(5);
+ // 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);