From cc86e130ea24468282475e5bdc32080a592cdede Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 6 May 2022 23:06:36 +1200 Subject: [PATCH] Hide setMainGene, add setGene instead. --- .../disguisetypes/watchers/PandaWatcher.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java index e05bce4f..8d5ed411 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java @@ -20,11 +20,22 @@ public class PandaWatcher extends AgeableWatcher { super(disguise); if (DisguiseConfig.isRandomDisguises()) { + // We don't do 'setGene' here so it's just as random as it would be as if it was natural. setMainGene(Panda.Gene.values()[new Random().nextInt(Panda.Gene.values().length)]); setHiddenGene(Panda.Gene.values()[new Random().nextInt(Panda.Gene.values().length)]); } } + public Panda.Gene getGene() { + return getMainGene(); + } + + @RandomDefaultValue + public void setGene(Panda.Gene gene) { + setMainGene(gene); + setHiddenGene(gene); + } + public Panda.Gene getMainGene() { int id = getData(MetaIndex.PANDA_MAIN_GENE); @@ -39,7 +50,7 @@ public class PandaWatcher extends AgeableWatcher { return Panda.Gene.NORMAL; } - @RandomDefaultValue + @MethodOnlyUsedBy(value = {}) // Hide from command public void setMainGene(Panda.Gene gene) { setData(MetaIndex.PANDA_MAIN_GENE, (byte) gene.ordinal()); sendData(MetaIndex.PANDA_MAIN_GENE); @@ -59,7 +70,6 @@ public class PandaWatcher extends AgeableWatcher { return Panda.Gene.NORMAL; } - @RandomDefaultValue @MethodOnlyUsedBy(value = {}) // Hide from command public void setHiddenGene(Panda.Gene gene) { setData(MetaIndex.PANDA_HIDDEN_GENE, (byte) gene.ordinal());