Update from upstream SpigotMC

eb39b4729ce
59b08be5833
a723278f74a
This commit is contained in:
Zach Brown 2015-01-04 20:01:24 -06:00
parent 3fba354aa5
commit b360cf686f
19 changed files with 67 additions and 80 deletions

View file

@ -1,14 +1,14 @@
From dd80360067eb138d8633edcb2392d118d509b242 Mon Sep 17 00:00:00 2001
From 0a5c11f342f2957ea2952a4094d7c010a546ece6 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 9fa886f..dc1e5da 100644
index de7815f..7fb08af 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -341,4 +341,22 @@ public interface Entity extends Metadatable {
@@ -342,4 +342,22 @@ public interface Entity extends Metadatable, CommandSender {
* @return if the custom name is displayed
*/
public boolean isCustomNameVisible();