From 71f8b70f10062a23dc7eff46f8951c7c8ed7980e Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 20 Mar 2016 23:15:37 -0500
Subject: [PATCH] Also handle original end case that spawned the issue Final
 commit for GH-96 if there's any justine in the world

---
 ...ly-mark-player-as-invulnerable-if-they-re-changing.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-changing.patch b/Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-changing.patch
index eaaca8bc56..88bdaad5cc 100644
--- a/Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-changing.patch
+++ b/Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-changing.patch
@@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private long ch = System.currentTimeMillis();
      private Entity ci = null;
 -    private boolean cj;
-+    protected boolean cj; // Paper - private -> protected
++    protected boolean cj; // Paper - public -> protected
      private int containerCounter;
      public boolean f;
      public int ping;
@@ -22,10 +22,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      public Entity c(int i) {
 -        this.cj = true;
-+        //this.cj = true; // Paper - Moved to PlayerList#changeDimension
++        //this.cj = true; // Moved down and into PlayerList#changeDimension
          if (this.dimension == 1 && i == 1) {
++            this.cj = true; // Paper - Moved down
              this.world.kill(this);
              if (!this.viewingCredits) {
+                 this.viewingCredits = true;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java