Upstream merge + remove 3 pulled patches.

By: md_5 <md_5@live.com.au>
2013-09-12 10:17:46 +10:00
parent 70387ed9d8
commit 754e2b5680
28 changed files with 42 additions and 231 deletions
--- a/CraftBukkit-Patches/0065-Add-Getter-for-Entity-Invulnerability.patch
+++ b/CraftBukkit-Patches/0065-Add-Getter-for-Entity-Invulnerability.patch
@@ -0,0 +1,25 @@
+From 8a9ef0403468ad7597e4b0e70ae3a61a18bf88b0 Mon Sep 17 00:00:00 2001
+From: DerFlash <bte@freenet.de>
+Date: Sat, 3 Aug 2013 19:53:48 +1000
+Subject: [PATCH] Add Getter for Entity Invulnerability
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+index 4f4b84f..65a77dc 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -402,6 +402,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+     // Spigot start
+     private final Spigot spigot = new Spigot()
+     {
+        @Override
+        public boolean isInvulnerable()
+        {
+            return getHandle().isInvulnerable();
+        }
+     };
+ 
+     public Spigot spigot()
+-- 
+1.8.1.2
+