Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0117-Optimize-Player-Lookup.patch

@@ -1,4 +1,4 @@
-From f3cde7b18ec8f58f094daf609cb27ca510342a90 Mon Sep 17 00:00:00 2001
+From bd80ed0c8452bc5386e1564cf0aef2de6bc8cfde Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 15 Mar 2014 14:34:03 +1100
 Subject: [PATCH] Optimize Player Lookup
@@ -164,10 +164,10 @@ index 5d8c557..707410b 100644
  
      // TODO: In 1.7.6+ this should use the server's UUID->EntityPlayer map
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 260502b..a5d3eee 100644
+index 3010245..2ecde57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -94,13 +94,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -95,13 +95,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public boolean isOnline() {
@@ -183,5 +183,5 @@ index 260502b..a5d3eee 100644
  
      public InetSocketAddress getAddress() {
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0