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

@eutherin#5367 fixed name ordering

Browse Source
This commit is contained in:
libraryaddict
2020-05-08 02:34:43 +12:00
parent d1c0e9eff8
commit f40492b2e7
5 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View File

@@ -1269,7 +1269,7 @@ public class DisguiseUtilities {
return;
}
int[] ids = Arrays.copyOf(disguise.getArmorstandIds(), 1 + disguise.getMultiName().length);
int[] ids = Arrays.copyOf(disguise.getArmorstandIds(), 1 + disguise.getMultiNameLength());
ids[ids.length - 1] = DisguiseAPI.getSelfDisguiseId();
// Send a packet to destroy the fake entity
@@ -1760,6 +1760,16 @@ public class DisguiseUtilities {
return string.replaceAll("\\\\(?=\\\\+n)", "\\\\\\\\");
}
public static String[] reverse(String[] array) {
String[] newArray = new String[array.length];
for (int i = 1; i <= array.length; i++) {
newArray[array.length - i] = array[i - 1];
}
return newArray;
}
public static String[] splitNewLine(String string) {
if (string.contains("\n")) {
return string.split("\n");
@@ -2281,22 +2291,23 @@ public class DisguiseUtilities {
}
}
public static ArrayList<PacketContainer> getNamePackets(Disguise disguise, String[] oldNames) {
public static ArrayList<PacketContainer> getNamePackets(Disguise disguise, String[] internalOldNames) {
ArrayList<PacketContainer> packets = new ArrayList<>();
String[] newNames =
(disguise instanceof PlayerDisguise && !((PlayerDisguise) disguise).isNameVisible()) ? new String[0] :
disguise.getMultiName();
int[] standIds = disguise.getArmorstandIds();
int[] destroyIds = new int[0];
internalOldNames = DisguiseUtilities.reverse(internalOldNames);
if (oldNames.length > newNames.length) {
if (internalOldNames.length > newNames.length) {
// Destroy packet
destroyIds = Arrays.copyOfRange(standIds, newNames.length, oldNames.length);
destroyIds = Arrays.copyOfRange(standIds, newNames.length, internalOldNames.length);
}
for (int i = 0; i < newNames.length; i++) {
if (i < oldNames.length) {
if (newNames[i].equals(oldNames[i]) || newNames[i].isEmpty()) {
if (i < internalOldNames.length) {
if (newNames[i].equals(internalOldNames[i]) || newNames[i].isEmpty()) {
continue;
}

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

@@ -42,7 +42,7 @@ public class PacketHandlerMovement implements IPacketHandler {
Entity entity) {
handle2(disguise, sentPacket, packets, observer, entity);
int len = disguise.getMultiName().length;
int len = disguise.getMultiNameLength();
if (len == 0) {
return;

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

@@ -34,7 +34,7 @@ public class PacketListenerDestroyEntity extends PacketAdapter {
continue;
}
int len = disguise.getMultiName().length;
int len = disguise.getMultiNameLength();
if (len == 0) {
continue;