From 5bc0a094b31b6dc5c2fa28c6ec5bc549becdef1e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 12 Nov 2024 20:51:01 +1100
Subject: [PATCH] SPIGOT-7955: Failure teleporting players between worlds using
 Player#teleport() when player has attribute modifiers

---
 .../net/minecraft/server/level/EntityPlayer.patch        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nms-patches/net/minecraft/server/level/EntityPlayer.patch b/nms-patches/net/minecraft/server/level/EntityPlayer.patch
index d2126ebd7..c8e70068b 100644
--- a/nms-patches/net/minecraft/server/level/EntityPlayer.patch
+++ b/nms-patches/net/minecraft/server/level/EntityPlayer.patch
@@ -999,6 +999,15 @@
      }
  
      @Override
+@@ -1677,7 +2081,7 @@
+         this.onUpdateAbilities();
+         if (flag) {
+             this.getAttributes().assignBaseValues(entityplayer.getAttributes());
+-            this.getAttributes().assignPermanentModifiers(entityplayer.getAttributes());
++            // this.getAttributes().assignPermanentModifiers(entityplayer.getAttributes()); // CraftBukkit
+             this.setHealth(entityplayer.getHealth());
+             this.foodData = entityplayer.foodData;
+             Iterator iterator = entityplayer.getActiveEffects().iterator();
 @@ -1685,7 +2089,7 @@
              while (iterator.hasNext()) {
                  MobEffect mobeffect = (MobEffect) iterator.next();