Also handle original end case that spawned the issue
Final commit for GH-96 if there's any justine in the world
This commit is contained in:
parent
082e07406f
commit
ef3a9f1286
|
@ -1,11 +1,11 @@
|
|||
From aa0e7b4e75714e38c4ed7576eef5fb1b2ca1f101 Mon Sep 17 00:00:00 2001
|
||||
From 07c63522e8752c57ee46c2a7dfbde6d75c0dc12c 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 changing worlds
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index 3902d4f..2c497c6 100644
|
||||
index 3902d4f..6ff0061 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -48,7 +48,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
|
@ -13,19 +13,21 @@ index 3902d4f..2c497c6 100644
|
|||
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;
|
||||
@@ -541,7 +541,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
@@ -541,8 +541,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
}
|
||||
|
||||
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 344abbb..c6bad9e 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
|
|
Loading…
Reference in New Issue