Upstream/LibsDisguises
1
0
Fork 1
mirror of https://github.com/libraryaddict/LibsDisguises.git synced 2024-09-10 01:28:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add sounds for self disguises player to not be cancelled.

Browse Source
This commit is contained in:
libraryaddict 2013-12-15 02:33:11 +13:00
parent d4461f7ade
commit b026f30087
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -551,11 +551,11 @@ public abstract class Disguise {
* Can the disguised view himself as the disguise * Can the disguised view himself as the disguise
*/ */
public void setViewSelfDisguise(boolean viewSelfDisguise) { public void setViewSelfDisguise(boolean viewSelfDisguise) {
if (this.viewSelfDisguise != viewSelfDisguise) { if (isSelfDisguiseVisible() != viewSelfDisguise) {
this.viewSelfDisguise = viewSelfDisguise; this.viewSelfDisguise = viewSelfDisguise;
if (getEntity() != null && getEntity() instanceof Player) { if (getEntity() != null && getEntity() instanceof Player) {
if (DisguiseAPI.getDisguise((Player) getEntity(), getEntity()) == this) { if (DisguiseAPI.getDisguise((Player) getEntity(), getEntity()) == this) {
if (viewSelfDisguise) { if (isSelfDisguiseVisible()) {
DisguiseUtilities.setupFakeDisguise(this); DisguiseUtilities.setupFakeDisguise(this);
} else } else
DisguiseUtilities.removeSelfDisguise((Player) getEntity()); DisguiseUtilities.removeSelfDisguise((Player) getEntity());

3
src/me/libraryaddict/disguise/utilities/PacketsManager.java
View File

@ -764,7 +764,8 @@ public class PacketsManager {
} }
else if (event.getPacketType() == PacketType.Play.Server.ENTITY_STATUS) { else if (event.getPacketType() == PacketType.Play.Server.ENTITY_STATUS) {
if (DisguiseAPI.getDisguise(event.getPlayer(), event.getPlayer()).isSelfDisguiseSoundsReplaced() Disguise disguise = DisguiseAPI.getDisguise(event.getPlayer(), event.getPlayer());
if (disguise.getType() != DisguiseType.PLAYER && disguise.isSelfDisguiseSoundsReplaced()
&& (Byte) event.getPacket().getModifier().read(1) == (ReflectionManager.isAfter17() ? 2 : 1)) { && (Byte) event.getPacket().getModifier().read(1) == (ReflectionManager.isAfter17() ? 2 : 1)) {
event.setCancelled(true); event.setCancelled(true);
} }