fix: villager exploit

Author: bridge

src/main/java/world/minecraftservers/plugin/ContainerExploitPrevention.java

@@ -37,6 +37,7 @@
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataHolder;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -122,12 +123,12 @@ public void onPacketSending(PacketEvent event) {
                     PacketContainer packet = event.getPacket();
                     Entity entity = packet.getEntityModifier(event).read(0);
 
-                    if (entity instanceof Vehicle vehicle) {
-                        PersistentDataContainer pdc = vehicle.getPersistentDataContainer();
+                    if (entity instanceof InventoryHolder) {
+                        PersistentDataContainer pdc = entity.getPersistentDataContainer();
                         String serializedCustomName = pdc.get(clientSideRenderTitleKey, PersistentDataType.STRING);
 
                         if (serializedCustomName != null) {
-                            WrappedDataWatcher dataWatcher = WrappedDataWatcher.getEntityWatcher(vehicle).deepClone();
+                            WrappedDataWatcher dataWatcher = WrappedDataWatcher.getEntityWatcher(entity).deepClone();
                             WrappedDataWatcher.Serializer chatSerializer = WrappedDataWatcher.Registry.getChatComponentSerializer(true);
                             final WrappedDataWatcher.WrappedDataWatcherObject optChatFieldWatcher = new WrappedDataWatcher.WrappedDataWatcherObject(2, chatSerializer);
 
@@ -217,21 +218,22 @@ public void onVehicleDestroy(VehicleDestroyEvent event) {
         }
     }
 
-    // This is mainly for donkeys
+    // This is mainly for donkeys, villagers etc...
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onVehicleInteract(PlayerInteractEntityEvent event) {
-        if (event.getRightClicked() instanceof Vehicle vehicle) {
+        Entity rightClicked = event.getRightClicked();
+        if (rightClicked instanceof InventoryHolder) {
             Player player = event.getPlayer();
             ItemStack itemInHand = player.getInventory().getItem(event.getHand());
 
             if (itemInHand.getType() == Material.NAME_TAG) {
                 // Not happy with how this works, but seems to be the only way :( Create a PR if you have a better idea
                 Bukkit.getScheduler().runTaskLater(this, () -> {
-                    Component customName = vehicle.customName();
+                    Component customName = rightClicked.customName();
 
                     if (customName != null && canUseTitle(customName)) {
-                        vehicle.customName(null);
-                        PersistentDataContainer pdc = vehicle.getPersistentDataContainer();
+                        rightClicked.customName(null);
+                        PersistentDataContainer pdc = rightClicked.getPersistentDataContainer();
                         pdc.set(clientSideRenderTitleKey, PersistentDataType.STRING, GsonComponentSerializer.gson().serialize(customName));
                     }
                 }, 1L);