Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-06 00:07:56 +01:00
Code Issues Projects Releases Wiki Activity

Also handle original end case that spawned the issue

Browse Source 
Final commit for GH-96 if there's any justine in the world
This commit is contained in:
Zach Brown 2016-03-20 23:15:37 -05:00
parent c0d5c00a34
commit 71f8b70f10
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-changing.patch
View File

@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private long ch = System.currentTimeMillis(); private long ch = System.currentTimeMillis();
private Entity ci = null; private Entity ci = null;
- private boolean cj; - private boolean cj;
+ protected boolean cj; // Paper - private -> protected + protected boolean cj; // Paper - public -> protected
private int containerCounter; private int containerCounter;
public boolean f; public boolean f;
public int ping; public int ping;
@ -22,10 +22,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public Entity c(int i) { public Entity c(int i) {
- this.cj = true; - 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) { if (this.dimension == 1 && i == 1) {
+ this.cj = true; // Paper - Moved down
this.world.kill(this); this.world.kill(this);
if (!this.viewingCredits) { 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 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java