twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-19 06:13:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Only mark player as invulnerable if they're going to the end

Browse Source 
cc GH-96
This commit is contained in:
Zach Brown
2016-03-20 19:44:49 -05:00
parent 372152df9d
commit 84b79f3f41
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Spigot-Server-Patches/Only-mark-player-as-invulnerable-if-they-re-going-to.patch Normal file
View File

@@ -0,0 +1,21 @@
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;
--