diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 87484b92d2..e1b16b458c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -594,6 +594,21 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
         getHandle().portalCooldown = cooldown;
     }
 
+    @Override
+    public Set<String> getScoreboardTags() {
+        return getHandle().P(); // PAIL: getScoreboardTags
+    }
+
+    @Override
+    public boolean addScoreboardTag(String tag) {
+        return getHandle().a(tag); // PAIL: addScoreboardTag
+    }
+
+    @Override
+    public boolean removeScoreboardTag(String tag) {
+        return getHandle().b(tag); // PAIL: removeScoreboardTag
+    }
+
     private static PermissibleBase getPermissibleBase() {
         if (perm == null) {
             perm = new PermissibleBase(new ServerOperator() {