19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
26 lines
889 B
Diff
26 lines
889 B
Diff
From 78d9aa55fcc0bc2b2184e739d98d161933be842d 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 4b26bb0..c50396d 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -440,6 +440,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(net.minecraft.server.DamageSource.GENERIC);
|
|
+ }
|
|
};
|
|
|
|
public Spigot spigot()
|
|
--
|
|
2.1.0
|
|
|