PaperMC/Spigot-Server-Patches/0099-Only-mark-player-as-invulnerable-if-they-re-changing.patch

45 lines
2.2 KiB
Diff

From a1e0945bc90bf87dbad2b500ea020adf90da906e 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 changing worlds
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 3902d4f..efb88ef 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -48,7 +48,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
private boolean cg = true;
private long ch = System.currentTimeMillis();
private Entity ci = null;
- private boolean cj;
+ protected boolean cj; // Paper - private -> protected
private int containerCounter;
public boolean f;
public int ping;
@@ -541,8 +541,9 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public Entity c(int i) {
- this.cj = true;
+ //this.cj = true; // Moved down and into PlayerList#changeDimension
if (this.dimension == 1 && i == 1) {
+ this.cj = true; // Paper - Moved down
this.world.kill(this);
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
index 344abbb..c6bad9e 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -724,6 +724,7 @@ public abstract class PlayerList {
Location exit = null;
boolean useTravelAgent = false; // don't use agent for custom worlds or return from THE_END
if (exitWorld != null) {
+ entityplayer.cj = true; // Paper - Set teleport invulnerability only if they're actually changing worlds
if ((cause == TeleportCause.END_PORTAL) && (i == 0)) {
// THE_END -> NORMAL; use bed if available, otherwise default spawn
exit = ((org.bukkit.craftbukkit.entity.CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation();
--
2.7.4