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

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-server/nms-patches/EntityThrownExpBottle.patch
View File

@@ -1,15 +1,14 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityThrownExpBottle.java 2014-11-28 17:43:43.169707433 +0000
+++ src/main/java/net/minecraft/server/EntityThrownExpBottle.java 2014-11-28 17:38:19.000000000 +0000
@@ -28,8 +28,17 @@
--- /home/matt/mc-dev-private//net/minecraft/server/EntityThrownExpBottle.java 2015-02-26 22:40:22.707608138 +0000
+++ src/main/java/net/minecraft/server/EntityThrownExpBottle.java 2015-02-26 22:40:22.707608138 +0000
@@ -28,9 +28,18 @@
protected void a(MovingObjectPosition movingobjectposition) {
if (!this.world.isStatic) {
if (!this.world.isClientSide) {
- 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);
+
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();
@@ -17,6 +16,7 @@
+ this.world.triggerEffect(2002, new BlockPosition(this), 0);
+ }
+ // CraftBukkit end
+
while (i > 0) {
int j = EntityExperienceOrb.getOrbValue(i);