From cef1edae317b21e3ec2951347ce9f755c87273fa Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.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 3902d4f..9c72cec 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -541,8 +541,8 @@ 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;
-- 
2.7.2.windows.1