mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-01 17:01:56 +01:00
21 lines
1,017 B
Diff
21 lines
1,017 B
Diff
|
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;
|
||
|
|
--
|