Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-06 07:32:07 +01:00
Code Issues Projects Releases Wiki Activity

Try to prevent an NPE from origin data (Fixes #5905)

Browse Source
This commit is contained in:
Shane Freeder 2021-06-21 10:04:18 +01:00
parent 1763250105
commit 58c3edcb08
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/Entity-Origin-API.patch
View File

@ -72,9 +72,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper start - Restore the entity's origin location
+ ListTag originTag = nbt.getList("Paper.Origin", 6);
+ if (!originTag.isEmpty()) {
+ UUID originWorld = level.getWorld().getUID();
+ UUID originWorld = null;
+ if (nbt.contains("Paper.OriginWorld")) {
+ originWorld = nbt.getUUID("Paper.OriginWorld");
+ } else if (this.level != null) {
+ originWorld = this.level.getWorld().getUID();
+ }
+ this.originWorld = originWorld;
+ origin = new org.bukkit.util.Vector(originTag.getDouble(0), originTag.getDouble(1), originTag.getDouble(2));