Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 20:46:59 +01:00
Code Issues Projects Releases Wiki Activity

Ensure that the world of a dead entity is not changed in a portal

Browse Source
This commit is contained in:
Shane Freeder 2017-03-19 01:33:26 +00:00
parent a30343c85e
commit 02afedb602
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Spigot-Server-Patches/0213-Fix-a-duplicate-alive-entity-on-second-world.patch → Spigot-Server-Patches/0213-Do-not-allow-portals-to-move-dead-entities-across-wo.patch
View File

@ -1,11 +1,11 @@
From 791a5b0f6feb0c241429bd044f2255ee251c3bc4 Mon Sep 17 00:00:00 2001 From 9b910d46c99320223dfa35efe4f3453bfa008313 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 17 Mar 2017 01:45:15 +0000 Date: Fri, 17 Mar 2017 01:45:15 +0000
Subject: [PATCH] Fix a duplicate alive entity on second world Subject: [PATCH] Do not allow portals to move dead entities across worlds
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0e1d9817b..385329774 100644 index 0e1d9817..38532977 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2325,7 +2325,7 @@ public abstract class Entity implements ICommandListener { @@ -2325,7 +2325,7 @@ public abstract class Entity implements ICommandListener {
@ -39,6 +39,19 @@ index 0e1d9817b..385329774 100644
boolean flag = entity.attachedToPlayer; boolean flag = entity.attachedToPlayer;
entity.attachedToPlayer = true; entity.attachedToPlayer = true;
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index a9d59bbf..2d8717f4 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -987,7 +987,7 @@ public abstract class PlayerList {
worldserver.methodProfiler.b();
}
- entity.spawnIn(worldserver1);
+ if (!entity.dead) entity.spawnIn(worldserver1); // Paper - Do not move dead entities
// CraftBukkit end
}
-- --
2.12.0 2.12.0