Upstream merge

By: md_5 <git@md-5.net>

Bukkit-Patches/0017-Add-Getter-for-Entity-Invulnerability.patch

@@ -1,14 +1,14 @@
-From 2b0c15a4f33f6f6f08f59c0245675a45a83ac572 Mon Sep 17 00:00:00 2001
+From a8a099f5f2035ace89be9d9b7dfe4cc7c470a629 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:49:36 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 72af4fa..a5b2100 100644
+index 396ea20..294e80b 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -280,4 +280,22 @@ public interface Entity extends Metadatable {
+@@ -291,4 +291,22 @@ public interface Entity extends Metadatable {
       * @return The current vehicle.
       */
      public Entity getVehicle();
@@ -32,5 +32,5 @@ index 72af4fa..a5b2100 100644
 +    // Spigot End
  }
 -- 
-1.8.1.2
+1.8.3.2