From 92c68e2367dc4b8ef7a86f5baa6e17d7b02c1360 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 7 Sep 2021 22:33:28 +0100
Subject: [PATCH] Fixup enderpearl patch

---
 build-data/paper.at                               |  4 ++++
 .../server/Block-Enderpearl-Travel-Exploit.patch  | 15 ++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/build-data/paper.at b/build-data/paper.at
index fc7d783869..e924e5b0fd 100644
--- a/build-data/paper.at
+++ b/build-data/paper.at
@@ -237,3 +237,7 @@ public org.bukkit.craftbukkit.inventory.CraftMetaFirework getNBT(Lorg/bukkit/Fir
 
 # Vanilla command permission fixes
 public-f com.mojang.brigadier.tree.CommandNode requirement
+
+# Block Enderpearl Travel Exploit
+public net.minecraft.world.entity.projectile.Projectile cachedOwner
+public net.minecraft.world.entity.projectile.Projectile ownerUUID
diff --git a/patches/server/Block-Enderpearl-Travel-Exploit.patch b/patches/server/Block-Enderpearl-Travel-Exploit.patch
index d121f3631c..748168ba3b 100644
--- a/patches/server/Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/Block-Enderpearl-Travel-Exploit.patch
@@ -42,23 +42,16 @@ diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpear
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-@@ -0,0 +0,0 @@ import net.minecraft.world.entity.monster.Endermite;
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.item.Item;
- import net.minecraft.world.item.Items;
-+import net.minecraft.world.level.ChunkPos;
- import net.minecraft.world.level.GameRules;
- import net.minecraft.world.level.Level;
- import net.minecraft.world.phys.EntityHitResult;
 @@ -0,0 +0,0 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
              super.tick();
          }
  
 +        // Paper start
 +        if (this.level.paperConfig.disableEnderpearlExploit) {
-+            final net.minecraft.server.level.ChunkHolder chunkHolder = ((net.minecraft.server.level.ServerChunkCache) this.level.getChunkSource()).chunkMap.getVisibleChunkIfPresent(ChunkPos.asLong(this.blockPosition()));
-+            if (chunkHolder == null || net.minecraft.server.level.ChunkHolder.getFullChunkStatus(chunkHolder.getTicketLevel()).isOrAfter(net.minecraft.server.level.ChunkHolder.FullChunkStatus.ENTITY_TICKING)) {
-+                this.setOwner(null);
++            final net.minecraft.server.level.ChunkHolder chunkHolder = ((net.minecraft.server.level.ServerChunkCache) this.level.getChunkSource()).chunkMap.getVisibleChunkIfPresent(net.minecraft.world.level.ChunkPos.asLong(this.blockPosition()));
++            if (chunkHolder == null || !net.minecraft.server.level.ChunkHolder.getFullChunkStatus(chunkHolder.getTicketLevel()).isOrAfter(net.minecraft.server.level.ChunkHolder.FullChunkStatus.ENTITY_TICKING)) {
++                this.cachedOwner = null;
++                this.ownerUUID = null;
 +            }
 +        }
 +        // Paper end