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

More disguiseNextEntity fixing

Browse Source
This commit is contained in:
libraryaddict
2020-04-22 14:20:52 +12:00
parent 7f65d8c8f1
commit fa4c577f7e
3 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerMain.java
View File

@@ -39,25 +39,10 @@ public class PacketListenerMain extends PacketAdapter {
final Disguise disguise = DisguiseUtilities.getDisguise(observer, entityId);
if (disguise == null) {
return;
}
if (disguise.getEntity() == null) {
for (Entity e : observer.getWorld().getEntities()) {
if (e.getEntityId() != entityId) {
continue;
}
disguise.setEntity(e);
break;
}
}
// If the entity is the same as the sender. Don't disguise!
// Prevents problems and there is no advantage to be gained.
// Or if they are null and there's no disguise
if (disguise.getEntity() == observer) {
if (disguise == null || disguise.getEntity() == observer) {
return;
}

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

@@ -257,7 +257,7 @@ public class PacketListenerSounds extends PacketAdapter {
Entity entity = disguise.getEntity();
if (disguise != null && !disguise.getType().isPlayer() &&
if (!disguise.getType().isPlayer() &&
(disguise.isSelfDisguiseSoundsReplaced() || entity != event.getPlayer())) {
DisguiseSound disSound = DisguiseSound.getType(entity.getType().name());