From 9083a5ba84d11cce03460a9df3ae7653eeac4926 Mon Sep 17 00:00:00 2001 From: NavidK0 Date: Tue, 21 Apr 2015 16:01:50 -0400 Subject: [PATCH] Fixed data values for blocks as of 1.8.3. --- .../libraryaddict/disguise/utilities/BaseDisguiseCommand.java | 3 ++- .../me/libraryaddict/disguise/utilities/PacketsManager.java | 2 +- src/main/resources/plugin.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/utilities/BaseDisguiseCommand.java b/src/main/java/me/libraryaddict/disguise/utilities/BaseDisguiseCommand.java index d54cb250..5a7b9848 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/BaseDisguiseCommand.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/BaseDisguiseCommand.java @@ -346,7 +346,8 @@ public abstract class BaseDisguiseCommand implements CommandExecutor { } optionPermissions = map.get(disguiseType); HashMap disguiseOptions = this.getDisguisePermission(sender, disguiseType); - if (disguiseType.isPlayer()) {// If he is doing a player disguise + if (disguiseType.isPlayer()) { + // If he is doing a player disguise if (args.length == 1) { // He needs to give the player name throw new DisguiseParseException(ChatColor.RED + "Error! You need to give a player name!"); diff --git a/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java b/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java index 453aa736..36c8ec2f 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java @@ -323,7 +323,7 @@ public class PacketsManager { int id = disguise.getType().getEntityId(); int data = ((MiscDisguise) disguise).getData(); if (disguise.getType() == DisguiseType.FALLING_BLOCK) { - data = (((MiscDisguise) disguise).getId() | data << 16); + data = ((MiscDisguise) disguise).getId() + (data << 12); } else if (disguise.getType() == DisguiseType.FISHING_HOOK && data == 0) { // If the MiscDisguise data isn't set. Then no entity id was provided, so default to the owners entity id data = disguisedEntity.getEntityId(); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ea57a1ae..9bde506d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: LibsDisguises main: me.libraryaddict.disguise.LibsDisguises -version: 8.3.2 +version: 8.3.3 author: libraryaddict authors: [Byteflux, Navid K.] depend: [ProtocolLib]