From 537c4994db380032dbe7e03d967296a35ddc5749 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 20 Mar 2016 19:44:49 -0500 Subject: [PATCH] Only mark player as invulnerable if they're going to the end cc GH-96 --- .../0075-Add-exception-reporting-event.patch | 6 ++--- ...-as-invulnerable-if-they-re-going-to.patch | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 Spigot-Server-Patches/0098-Only-mark-player-as-invulnerable-if-they-re-going-to.patch diff --git a/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch index c6ca0b0d7..9ccf0b5e4 100644 --- a/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch @@ -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 Date: Thu, 3 Mar 2016 03:15:41 -0600 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 -index 2919415..d569f3b 100644 +index 4a72c3f..b356aa6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -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) } -- -2.7.2 +2.7.2.windows.1 diff --git a/Spigot-Server-Patches/0098-Only-mark-player-as-invulnerable-if-they-re-going-to.patch b/Spigot-Server-Patches/0098-Only-mark-player-as-invulnerable-if-they-re-going-to.patch new file mode 100644 index 000000000..5cc2e70de --- /dev/null +++ b/Spigot-Server-Patches/0098-Only-mark-player-as-invulnerable-if-they-re-going-to.patch @@ -0,0 +1,23 @@ +From cef1edae317b21e3ec2951347ce9f755c87273fa Mon Sep 17 00:00:00 2001 +From: Zach Brown +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 +