🚧 Working on v0.4.4

- Fixed bug, with the entity destroy packet. 🐛
- Fixed bug, with PluginVersion. 🐛

Author: JakeNijssen

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.azortis</groupId>
   <artifactId>protocolvanish</artifactId>
-  <version>0.4.3-SNAPSHOT</version>
+  <version>0.4.4-SNAPSHOT</version>
   <build>
     <finalName>ProtocolVanish</finalName>
     <plugins>

src/main/java/com/azortis/protocolvanish/PluginVersion.java

@@ -55,7 +55,8 @@ public String getMessageFileVersion() {
     }
 
     public static PluginVersion getVersionFromString(String versionString){
-        return PluginVersion.valueOf("v" + versionString.replace(".", "_"));
+        String enumKey = "v" + versionString.replace(".", "_");
+        return PluginVersion.valueOf(enumKey);
     }
 
 }

src/main/java/com/azortis/protocolvanish/visibility/VisibilityChanger.java

@@ -37,6 +37,7 @@
 import org.bukkit.potion.PotionEffectType;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.UUID;
 
@@ -110,7 +111,9 @@ private void sendSpawnPlayerPacket(Player receiver, Player vanishedPlayer) {
     private void sendEntityDestroyPacket(Player receiver, Player vanishedPlayer) {
         if (ProtocolLibrary.getProtocolManager().getEntityTrackers(vanishedPlayer).contains(receiver)) {
             PacketContainer packetContainer = new PacketContainer(PacketType.Play.Server.ENTITY_DESTROY);
-            packetContainer.setMeta("ignoreFilter", true); // To make sure our packet doesn't get filtered
+            if(!plugin.getVisibilityManager().getBypassFilterPackets().containsKey(receiver.getUniqueId()))
+                plugin.getVisibilityManager().getBypassFilterPackets().put(receiver.getUniqueId(), new ArrayList<>());
+            plugin.getVisibilityManager().getBypassFilterPackets().get(receiver.getUniqueId()).add(vanishedPlayer.getEntityId());
 
             int[] entityId = new int[]{vanishedPlayer.getEntityId()};
             packetContainer.getIntegerArrays().write(0, entityId);

src/main/java/com/azortis/protocolvanish/visibility/VisibilityManager.java

@@ -40,6 +40,8 @@ public class VisibilityManager {
     private Collection<UUID> vanishedPlayers = new ArrayList<>();
     private HashMap<Player, Collection<Player>> vanishedFromMap = new HashMap<>();
 
+    private HashMap<UUID, List<Integer>> bypassFilterPackets = new HashMap<>(); // For the entityDestroy packet.
+
     public VisibilityManager(ProtocolVanish plugin) {
         this.plugin = plugin;
         this.visibilityChanger = new VisibilityChanger(plugin);
@@ -198,4 +200,13 @@ public Player getPlayerFromEntityID(int entityId, World world) {
         return null;
     }
 
+    /**
+     * Get the HashMap of packets that should't be filtered.
+     * Only for internal use.
+     *
+     * @return {@link HashMap} of packets that shouldn't be filtered.
+     */
+    public HashMap<UUID, List<Integer>> getBypassFilterPackets() {
+        return bypassFilterPackets;
+    }
 }

src/main/java/com/azortis/protocolvanish/visibility/packetlisteners/GeneralEntityPacketListener.java

@@ -61,11 +61,15 @@ public void onPacketSending(PacketEvent event) {
             } else if (packet.getType() == PacketType.Play.Server.ENTITY_DESTROY) {
                 int[] entityIds = packet.getIntegerArrays().read(0);
                 List<Integer> entityIdList = new ArrayList<>();
+                HashMap<UUID, List<Integer>> bypassFilterPackets = plugin.getVisibilityManager().getBypassFilterPackets();
                 for (int entityId : entityIds) {
                     Player player = plugin.getVisibilityManager().getPlayerFromEntityID(entityId, viewer.getWorld());
                     if (player == null) {
                         entityIdList.add(entityId);
-                    } else if (packet.getMeta("ignoreFilter").isPresent() && (boolean) packet.getMeta("ignoreFilter").get()) {
+                    } else if (bypassFilterPackets.containsKey(viewer.getUniqueId())
+                            && bypassFilterPackets.get(viewer.getUniqueId()).contains(entityId)) {
+                        bypassFilterPackets.get(viewer.getUniqueId()).remove(entityId);
+                        if(bypassFilterPackets.get(viewer.getUniqueId()).isEmpty())bypassFilterPackets.remove(viewer.getUniqueId());
                         entityIdList.add(entityId);
                     } else if (plugin.getVisibilityManager().isVanished(player.getUniqueId()) &&
                             !plugin.getVisibilityManager().isVanishedFrom(player, viewer)) {