1 files changed, 77 insertions, 0 deletions
diff --git a/CraftBukkit-Patches/0116-Fix-several-occurances-of-missed-diff.patch b/CraftBukkit-Patches/0116-Fix-several-occurances-of-missed-diff.patch
new file mode 100644
index 0000000000..79fbacaf2c
--- /dev/null
+++ b/CraftBukkit-Patches/0116-Fix-several-occurances-of-missed-diff.patch
@@ -0,0 +1,77 @@
+From bfba84240f75dc7556bc6705de356da944ffae6a Mon Sep 17 00:00:00 2001
+From: md_5 <[email protected]>
+Date: Sat, 12 Apr 2014 17:49:14 +1000
+Subject: [PATCH] Fix several occurances of missed diff.
+
+
+diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java b/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java
+index d16f035..9fe2a8b 100644
+--- a/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java
++++ b/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java
+@@ -15,7 +15,7 @@ final class DispenseBehaviorFireball extends DispenseBehaviorItem {
+         EnumFacing enumfacing = BlockDispenser.b(isourceblock.h());
+         IPosition iposition = BlockDispenser.a(isourceblock);
+         double d0 = iposition.getX() + (double) ((float) enumfacing.getAdjacentX() * 0.3F);
+-        double d1 = iposition.getY() + (double) ((float) enumfacing.getAdjacentY() * 0.3F);
++        double d1 = iposition.getY() + (double) ((float) enumfacing.getAdjacentX() * 0.3F);
+         double d2 = iposition.getZ() + (double) ((float) enumfacing.getAdjacentZ() * 0.3F);
+         World world = isourceblock.k();
+         Random random = world.random;
+diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
+index 8a3ea63..c9f2b13 100644
+--- a/src/main/java/net/minecraft/server/EntityBoat.java
++++ b/src/main/java/net/minecraft/server/EntityBoat.java
+@@ -147,7 +147,7 @@ public class EntityBoat extends Entity {
+         return !this.dead;
+     }
+ 
+-        public void h() {
++    public void h() {
+         // CraftBukkit start
+         double prevX = this.locX;
+         double prevY = this.locY;
+diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
+index a45bed9..98a4ac7 100644
+--- a/src/main/java/net/minecraft/server/EntityItem.java
++++ b/src/main/java/net/minecraft/server/EntityItem.java
+@@ -320,7 +320,7 @@ public class EntityItem extends Entity {
+     public ItemStack getItemStack() {
+         ItemStack itemstack = this.getDataWatcher().getItemStack(10);
+ 
+-        return itemstack == null ? new ItemStack(Blocks.STONE) : itemstack; 
++        return itemstack == null ? new ItemStack(Blocks.STONE) : itemstack;
+     }
+ 
+     public void setItemStack(ItemStack itemstack) {
+diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+index b04969a..0804fe7 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -1738,7 +1738,7 @@ public class PlayerConnection implements PacketPlayInListener {
+                     }
+ 
+                     if (itemstack.getItem() == Items.WRITTEN_BOOK && itemstack1.getItem() == Items.BOOK_AND_QUILL) {
+-                        CraftEventFactory.handleEditBookEvent(player, itemstack); // CraftBukkit
++                        CraftEventFactory.handleEditBookEvent(player, itemstack); // CraftBukkit
+                     }
+ 
+                     return;
+diff --git a/src/main/java/net/minecraft/server/PlayerSelector.java b/src/main/java/net/minecraft/server/PlayerSelector.java
+index 819a133..14d44f0 100644
+--- a/src/main/java/net/minecraft/server/PlayerSelector.java
++++ b/src/main/java/net/minecraft/server/PlayerSelector.java
+@@ -1,6 +1,10 @@
+ package net.minecraft.server;
+ 
+-import java.util.*;
++import java.util.Collections;
++import java.util.HashMap;
++import java.util.Iterator;
++import java.util.List;
++import java.util.Map;
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
+ 
+-- 
+1.9.1
+