From 84b79f3f4125fb4ccaf88e0c69d5dba21eae2f6e Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 20 Mar 2016 19:44:49 -0500
Subject: [PATCH] Only mark player as invulnerable if they're going to the end
 cc GH-96

---
 ...-as-invulnerable-if-they-re-going-to.patch | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-going-to.patch

diff --git a/Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-going-to.patch b/Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-going-to.patch
new file mode 100644
index 0000000000..1225f4e048
--- /dev/null
+++ b/Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-going-to.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Sun, 20 Mar 2016 19:40:51 -0500
+Subject: [PATCH] Only mark player as invulnerable if they're going to the end
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+     }
+ 
+     public Entity c(int i) {
+-        this.cj = true;
+         if (this.dimension == 1 && i == 1) {
++            this.cj = true; // Paper - Moved down, only mark entity as invulnerable if they're going into the end
+             this.world.kill(this);
+             if (!this.viewingCredits) {
+                 this.viewingCredits = true;
+--
\ No newline at end of file