From 61d1dcc231b5e1657a7b0fdae5089e21bcaa317c Mon Sep 17 00:00:00 2001
From: MeFisto94 <MeFisto94@users.noreply.github.com>
Date: Sun, 16 Aug 2020 14:09:32 +0200
Subject: [PATCH] Ignore Events if they are not caused by real players (i.e.
 citizens)

---
 .../bukkit/listener/PlayerEventListener.java  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
index c4d7c6d90..8392591b5 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
@@ -69,6 +69,7 @@ import com.plotsquared.core.util.MainUtil;
 import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.PremiumVerification;
+import com.plotsquared.core.util.ReflectionUtils;
 import com.plotsquared.core.util.RegExUtil;
 import com.plotsquared.core.util.entity.EntityCategories;
 import com.plotsquared.core.util.task.TaskManager;
@@ -139,6 +140,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 /**
@@ -153,7 +155,15 @@ public class PlayerEventListener extends PlotListener implements Listener {
     private PlayerMoveEvent moveTmp;
     private String internalVersion;
 
+    private final Predicate<Player> isRealPlayerCheck;
+
     {
+        Class<?> playerImplementation = ReflectionUtils.getCbClass("entity.CraftPlayer");
+        if (playerImplementation == null) {
+            isRealPlayerCheck = p -> true;
+        } else {
+            isRealPlayerCheck = p -> p.getClass() == playerImplementation;
+        }
         try {
             fieldPlayer = PlayerEvent.class.getDeclaredField("player");
             fieldPlayer.setAccessible(true);
@@ -346,6 +356,9 @@ public class PlayerEventListener extends PlotListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onTeleport(PlayerTeleportEvent event) {
+        if (!isRealPlayerCheck.test(event.getPlayer())) {
+            return;
+        }
         Player player = event.getPlayer();
         BukkitPlayer pp = BukkitUtil.getPlayer(player);
         Plot lastPlot = pp.getMeta(PlotPlayer.META_LAST_PLOT);
@@ -452,6 +465,9 @@ public class PlayerEventListener extends PlotListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void playerMove(PlayerMoveEvent event) {
+        if (!isRealPlayerCheck.test(event.getPlayer())) {
+            return;
+        }
         org.bukkit.Location from = event.getFrom();
         org.bukkit.Location to = event.getTo();
         int x2;
@@ -643,6 +659,9 @@ public class PlayerEventListener extends PlotListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onWorldChanged(PlayerChangedWorldEvent event) {
+        if (!isRealPlayerCheck.test(event.getPlayer())) {
+            return;
+        }
         Player player = event.getPlayer();
         BukkitPlayer pp = BukkitUtil.getPlayer(player);
         // Delete last location