From c7127f56f5fabc12efea2af39d16b805d339445f Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sat, 21 Jun 2014 09:48:00 +1200 Subject: [PATCH] Clean up the ItemFrameWatcher and add a small description to config.yml --- config.yml | 3 ++- .../watchers/ItemFrameWatcher.java | 20 ++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/config.yml b/config.yml index c9bb162c..3ef0029e 100644 --- a/config.yml +++ b/config.yml @@ -113,7 +113,8 @@ PacketsEnabled: # To be honest. This is basically "Disable entity animations". That option is called 'AddEntityAnimations' in the config but unlike that, this is always in effect. # Animations set by use of the api or through the disguise command are still in effect. Metadata: true - # Movement packets are the biggest cpu hit. These are majorly used to ensure that the disguises facing direction isn't bugged up + # Movement packets are the biggest cpu hit. These are majorly used to ensure that the disguises facing direction isn't bugged up. + # If you are using the Item_Frame disguise, when a packet is sent (Roughly every 2min) the disguise will bug up until they move. Movement: true # Disable this if you don't mind crashing everytime you see someone riding something disguised as a non-living entity Riding: true diff --git a/src/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java b/src/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java index 571ca52f..5893f269 100644 --- a/src/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java +++ b/src/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java @@ -10,26 +10,28 @@ public class ItemFrameWatcher extends FlagWatcher { super(disguise); } - public int getItemRotation() { - return (Integer) getValue(3, 0); - } - - public ItemStack getItemStack() { + public ItemStack getItem() { if (getValue(2, null) == null) return new ItemStack(0); return (ItemStack) getValue(2, null); } - public void setItemRotation(int rotation) { - setValue(3, (byte) (rotation % 4)); - sendData(3); + public int getRotation() { + return (Integer) getValue(3, 0); } - public void setItemStack(ItemStack newItem) { + public void setItem(ItemStack newItem) { + if (newItem == null) + newItem = new ItemStack(0); newItem = newItem.clone(); newItem.setAmount(1); setValue(2, newItem); sendData(2); } + public void setRotation(int rotation) { + setValue(3, (byte) (rotation % 4)); + sendData(3); + } + }