TotalFreedomMC/TF-LibsDisguises
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-LibsDisguises.git synced 2025-02-12 03:57:03 +00:00
Code Issues Projects Releases Wiki Activity

When constructing misc disguise. You can now set the itemstack

Browse source
This commit is contained in:
Andrew 2013-11-11 03:29:57 +13:00
parent c4be1b989e
commit 74d608afb9
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
View file

@ -1,6 +1,9 @@
package me.libraryaddict.disguise.disguisetypes;
import me.libraryaddict.disguise.disguisetypes.watchers.DroppedItemWatcher;
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack;
public class MiscDisguise extends Disguise {
private int data = -1;
@ -15,8 +18,9 @@ public class MiscDisguise extends Disguise {
}
public MiscDisguise(DisguiseType disguiseType, boolean replaceSounds, int addictionalData) {
this(disguiseType, replaceSounds, (disguiseType == DisguiseType.FALLING_BLOCK ? addictionalData : -1),
(disguiseType == DisguiseType.FALLING_BLOCK ? -1 : addictionalData));
this(disguiseType, replaceSounds, (disguiseType == DisguiseType.FALLING_BLOCK
|| disguiseType == DisguiseType.DROPPED_ITEM ? addictionalData : -1), (disguiseType == DisguiseType.FALLING_BLOCK
|| disguiseType == DisguiseType.DROPPED_ITEM ? -1 : addictionalData));
}
public MiscDisguise(DisguiseType disguiseType, boolean replaceSounds, int id, int data) {
@ -36,6 +40,8 @@ public class MiscDisguise extends Disguise {
break;
}
if (disguiseType == DisguiseType.FALLING_BLOCK && id != -1) {
} else if (disguiseType == DisguiseType.FALLING_BLOCK && id != -1) {
this.id = id;
} else {
this.id = disguiseType.getDefaultId();
@ -44,6 +50,11 @@ public class MiscDisguise extends Disguise {
data = disguiseType.getDefaultData();
this.data = data;
createDisguise(disguiseType, replaceSounds);
if (disguiseType == DisguiseType.DROPPED_ITEM) {
if (id > 0) {
((DroppedItemWatcher) getWatcher()).setItemStack(new ItemStack(id, data));
}
}
}
public MiscDisguise(DisguiseType disguiseType, int id, int data) {