core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

cc GH-96
This commit is contained in:
Zach Brown 2016-03-20 19:44:49 -05:00
parent f01982bf4c
commit 537c4994db
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0075-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From 153f8de5f5739122dd2c987cd1cdb32aa8c4e1d5 Mon Sep 17 00:00:00 2001 From 119a007a2fc330ca432c1f37d041d4b4b35192bf Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600 Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event Subject: [PATCH] Add exception reporting event
@ -292,7 +292,7 @@ index 320e52e..d40257f 100644
} }
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 2919415..d569f3b 100644 index 4a72c3f..b356aa6 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
@ -372,5 +372,5 @@ index 44e057c..cf0bd0c 100644
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
} }
-- --
2.7.2 2.7.2.windows.1

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

@ -0,0 +1,23 @@
From cef1edae317b21e3ec2951347ce9f755c87273fa 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 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 3902d4f..9c72cec 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -541,8 +541,8 @@ 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;
--
2.7.2.windows.1