SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Send armorstand destroy to all players regardless of tracker

Browse Source
This commit is contained in:
libraryaddict 2020-05-17 18:11:04 +12:00
parent 548627f2ee
commit adfd280cb7
No known key found for this signature in database
GPG Key ID: 052E4FBCD257AEA4
3 changed files with 2 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -917,7 +917,7 @@ public abstract class Disguise {
packet.getIntegerArrays().write(0, Arrays.copyOf(getArmorstandIds(), getMultiNameLength())); packet.getIntegerArrays().write(0, Arrays.copyOf(getArmorstandIds(), getMultiNameLength()));
try { try {
for (Player player : DisguiseUtilities.getPerverts(this)) { for (Player player : getEntity().getWorld().getPlayers()) {
ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet); ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet);
} }
} }

2
src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java
View File

@ -161,7 +161,7 @@ public class PacketsManager {
} }
mainListener = new PacketListenerMain(LibsDisguises.getInstance(), packetsToListen); mainListener = new PacketListenerMain(LibsDisguises.getInstance(), packetsToListen);
destroyListener = new PacketListenerDestroyEntity(LibsDisguises.getInstance()); destroyListener = new PacketListenerEntityDestroy(LibsDisguises.getInstance());
ProtocolLibrary.getProtocolManager().addPacketListener(mainListener); ProtocolLibrary.getProtocolManager().addPacketListener(mainListener);
ProtocolLibrary.getProtocolManager().addPacketListener(destroyListener); ProtocolLibrary.getProtocolManager().addPacketListener(destroyListener);

62
src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerDestroyEntity.java
View File

@ -1,62 +0,0 @@
package me.libraryaddict.disguise.utilities.packets.packetlisteners;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketEvent;
import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import org.bukkit.plugin.Plugin;
import java.util.Arrays;
/**
* Created by libraryaddict on 3/05/2020.
*/
public class PacketListenerDestroyEntity extends PacketAdapter {
public PacketListenerDestroyEntity(Plugin plugin) {
super(plugin, PacketType.Play.Server.ENTITY_DESTROY);
}
@Override
public void onPacketSending(PacketEvent event) {
int[] entityIds = event.getPacket().getIntegerArrays().read(0);
int[] newEntityIds = entityIds;
for (int entityId : entityIds) {
if (entityId == DisguiseAPI.getSelfDisguiseId()) {
return;
}
Disguise disguise = DisguiseUtilities.getDisguise(event.getPlayer(), entityId);
if (disguise == null) {
continue;
}
int len = disguise.getMultiNameLength();
if (len == 0) {
continue;
}
// If this packet has already been processed
if (entityIds.length == newEntityIds.length &&
Arrays.stream(entityIds).anyMatch(id -> id == disguise.getArmorstandIds()[0])) {
return;
}
newEntityIds = Arrays.copyOf(entityIds, entityIds.length + len);
for (int a = 0; a < len; a++) {
newEntityIds[newEntityIds.length - (a + 1)] = disguise.getArmorstandIds()[a];
}
}
if (entityIds.length == newEntityIds.length) {
return;
}
event.getPacket().getIntegerArrays().write(0, newEntityIds);
}
}