From 06a2975376c3d24db1c4ff4003411c653a6b7db2 Mon Sep 17 00:00:00 2001
From: Beaness <sikyserver@gmail.com>
Date: Wed, 3 Aug 2022 16:44:32 +0200
Subject: [PATCH] Remove affinitylock + fix enderpearl error

---
 eSpigot-Server/build.gradle.kts                  |  1 -
 .../net/minecraft/server/EntityEnderPearl.java   |  2 +-
 .../net/minecraft/server/MinecraftServer.java    | 16 +---------------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/eSpigot-Server/build.gradle.kts b/eSpigot-Server/build.gradle.kts
index 6c0bb95..1978ad4 100644
--- a/eSpigot-Server/build.gradle.kts
+++ b/eSpigot-Server/build.gradle.kts
@@ -49,7 +49,6 @@ dependencies {
     implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT")
     implementation("org.lz4:lz4-java:1.8.0")
     implementation("com.github.luben:zstd-jni:1.5.2-3")
-    implementation("net.openhft:affinity:3.20.0")
     implementation("net.jafama:jafama:2.3.2")
     implementation("com.eatthepath:fast-uuid:0.2.0")
 
diff --git a/eSpigot-Server/src/main/java/net/minecraft/server/EntityEnderPearl.java b/eSpigot-Server/src/main/java/net/minecraft/server/EntityEnderPearl.java
index 8edf9c1..9824dff 100644
--- a/eSpigot-Server/src/main/java/net/minecraft/server/EntityEnderPearl.java
+++ b/eSpigot-Server/src/main/java/net/minecraft/server/EntityEnderPearl.java
@@ -114,7 +114,7 @@ public class EntityEnderPearl extends EntityProjectile {
             if (entityliving instanceof EntityPlayer) {
                 final EntityPlayer entityplayer = (EntityPlayer)entityliving;
 
-                if (entityplayer.playerConnection.a().g() && entityplayer.world == this.world && !entityplayer.isSleeping()) {
+                if (entityplayer.playerConnection.a().g() && entityplayer.world == this.world && !entityplayer.isSleeping() && entityplayer.getBukkitEntity() != null && entityplayer.getBukkitEntity().isOnline()) {
                     if (teleportLocation != null) {
                         CraftPlayer player = entityplayer.getBukkitEntity();
                         Location previousLocation = player.getLocation();
diff --git a/eSpigot-Server/src/main/java/net/minecraft/server/MinecraftServer.java b/eSpigot-Server/src/main/java/net/minecraft/server/MinecraftServer.java
index 4b1068b..aa34749 100644
--- a/eSpigot-Server/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/eSpigot-Server/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -22,7 +22,6 @@ import io.netty.util.ResourceLeakDetector;
 import joptsimple.OptionSet;
 import com.elevatemc.spigot.eSpigot;
 import net.minecrell.terminalconsole.TerminalConsoleAppender;
-import net.openhft.affinity.AffinityLock;
 import org.apache.commons.lang3.Validate;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -714,14 +713,9 @@ public abstract class MinecraftServer extends ReentrantIAsyncHandler<TasksPerTic
     }
     // PandaSpigot end
     public void run() {
-        AffinityLock affinityLock = null;
-        try (final AffinityLock lock = AffinityLock.acquireLock()) {
+        try {
             this.serverStartTime = getNanos();
             if (this.init()) {
-                // eSpigot start - Thread affinity
-                MinecraftServer.LOGGER.info("[eSpigot] Locked main thread. CPU: " + lock.cpuId());
-                affinityLock = lock;
-
                 // eSpigot end
 
                 this.ab = az();
@@ -805,14 +799,6 @@ public abstract class MinecraftServer extends ReentrantIAsyncHandler<TasksPerTic
 
             this.a(crashreport);
         } finally {
-            // eSpigot start - Thread affinity
-            MinecraftServer.LOGGER.info("[eSpigot] " + (affinityLock == null ?
-                    "Didn't release affinity lock since it does not exist." : "Released affinity lock."));
-
-            if (affinityLock != null)
-                affinityLock.release();
-            // eSpigot end
-
             try {
                 org.spigotmc.WatchdogThread.doStop();
                 this.isStopped = true;