diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 658bd5f..40296d8 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/plugin.yml b/src/plugin.yml index e96135b..05a074d 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper -version: 3.12.1b +version: 3.12.1b1 loadbefore: [aPlugin] commands: money: diff --git a/src/sig/plugin/TwosideKeeper/ChallengeReward.java b/src/sig/plugin/TwosideKeeper/ChallengeReward.java index 52268df..c069a07 100644 --- a/src/sig/plugin/TwosideKeeper/ChallengeReward.java +++ b/src/sig/plugin/TwosideKeeper/ChallengeReward.java @@ -132,28 +132,25 @@ public class ChallengeReward { switch (rank) { case 1:{ return new ItemStack[]{ - Artifact.createArtifactItem(ArtifactItem.MYSTERIOUS_ESSENCE,5), - Artifact.createArtifactItem(ArtifactItem.ARTIFACT_ESSENCE,8), - Artifact.createArtifactItem(ArtifactItem.ARTIFACT_CORE,4), - Artifact.createArtifactItem(ArtifactItem.ARTIFACT_BASE,2), + Artifact.createArtifactItem(ArtifactItem.MYSTERIOUS_ESSENCE,2), + Artifact.createArtifactItem(ArtifactItem.ARTIFACT_ESSENCE,2), + Artifact.createArtifactItem(ArtifactItem.ARTIFACT_CORE,1), }; } case 2:{ return new ItemStack[]{ - Artifact.createArtifactItem(ArtifactItem.MYSTERIOUS_ESSENCE,3), - Artifact.createArtifactItem(ArtifactItem.ARTIFACT_ESSENCE,4), - Artifact.createArtifactItem(ArtifactItem.ARTIFACT_CORE,2), - Artifact.createArtifactItem(ArtifactItem.ARTIFACT_BASE,1), + Artifact.createArtifactItem(ArtifactItem.MYSTERIOUS_ESSENCE,1), + Artifact.createArtifactItem(ArtifactItem.ARTIFACT_ESSENCE,1), }; } case 3:{ return new ItemStack[]{ - Artifact.createArtifactItem(ArtifactItem.MYSTERIOUS_ESSENCE,3), + Artifact.createArtifactItem(ArtifactItem.MYSTERIOUS_ESSENCE,1), }; } case 438190894:{ return new ItemStack[]{ - Artifact.createArtifactItem(ArtifactItem.MYSTERIOUS_ESSENCE,5), + Artifact.createArtifactItem(ArtifactItem.MYSTERIOUS_ESSENCE,2), }; } default:{ diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index edbaaed..b087923 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -354,6 +354,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { public static List lavaplume_list = new ArrayList(); public static long LAST_SPECIAL_SPAWN = 0; public static long LAST_WEEKLY_RESET = 0; + public static List recentnumbers = new ArrayList(); public static CustomItem HUNTERS_COMPASS; public static CustomItem UPGRADE_SHARD; @@ -1395,6 +1396,15 @@ public class TwosideKeeper extends JavaPlugin implements Listener { } } },"daily"); + aPlugin.API.addCommand(args->{ + int attempts=1000; + int selectednumb = (int)(Math.random()*101); + while (attempts>0 && recentnumbers.contains(selectednumb)) { + selectednumb = (int)(Math.random()*101); + attempts--; + } + recentnumbers.add(selectednumb); + },"roll"); }, 90); } diff --git a/src/sig/plugin/TwosideKeeper/runServerHeartbeat.java b/src/sig/plugin/TwosideKeeper/runServerHeartbeat.java index ef10306..30f1efe 100644 --- a/src/sig/plugin/TwosideKeeper/runServerHeartbeat.java +++ b/src/sig/plugin/TwosideKeeper/runServerHeartbeat.java @@ -156,6 +156,7 @@ final public class runServerHeartbeat implements Runnable { //MOTD: "Thanks for playing on Sig's Minecraft!\n*bCheck out http://z-gamers.net/mc for update info!\n*aReport any bugs you find at http://zgamers.domain.com/mc/" ServerHeartbeat.getMOTD(); ServerHeartbeat.getServer().broadcastMessage(ChatColor.translateAlternateColorCodes('*', TwosideKeeper.MOTD)); + TwosideKeeper.recentnumbers.clear(); TwosideKeeper.habitat_data.increaseHabitationLevels(); TwosideKeeper.habitat_data.startinglocs.clear(); for (int i=0;i