diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 838b13f..b632f0c 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index d502eba..e3b8039 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -265,6 +265,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { public static LootLogger Loot_Logger; //The logger for Loot. public static AutoUpdatePlugin pluginupdater; public static boolean restarting_server=false; + public static List log_messages=new ArrayList(); long LastClearStructureTime = 0; @@ -475,6 +476,8 @@ public class TwosideKeeper extends JavaPlugin implements Listener { //Bukkit.getWorld("world").setFullTime(Bukkit.getWorld("world").getFullTime()-10); //LEGACY CODE. adjustServerTime(10); //WORK IN PROGRESS: Lamp updating code TO GO HERE. + + sendAllLoggedMessagesToSpam(); //SAVE SERVER SETTINGS. if (getServerTickTime()-LASTSERVERCHECK>=SERVERCHECKERTICKS) { //15 MINUTES (DEFAULT) @@ -781,6 +784,15 @@ public class TwosideKeeper extends JavaPlugin implements Listener { TwosideSpleefGames.TickEvent(); } + private void sendAllLoggedMessagesToSpam() { + StringBuilder finalstring = new StringBuilder(); + for (int i=0;i=loglv) { - DiscordMessageSender.sendToSpam(ChatColor.stripColor(logmessage)); + log_messages.add(ChatColor.stripColor(logmessage)); switch (loglv) { case 0: { //Only game breaking messages appear in level 0. diff --git a/src/sig/plugin/TwosideKeeper/WorldShopManager.java b/src/sig/plugin/TwosideKeeper/WorldShopManager.java index 97e3dde..c46618b 100644 --- a/src/sig/plugin/TwosideKeeper/WorldShopManager.java +++ b/src/sig/plugin/TwosideKeeper/WorldShopManager.java @@ -252,7 +252,11 @@ public class WorldShopManager { //Use this as the next world shop. TwosideKeeper.log("Found item for slot "+i, 5); shop.UpdateItem(shopchest.getInventory().getItem(i)); - shop.UpdateAmount(GenericFunctions.CountItems(shopchest.getInventory(), shopchest.getInventory().getItem(i))); + if (WorldShop.isPurchaseShopSign(s)) { + shop.UpdateAmount(GenericFunctions.CountEmptySpace(shopchest.getInventory(), shopchest.getInventory().getItem(i))); + } else { + shop.UpdateAmount(GenericFunctions.CountItems(shopchest.getInventory(), shopchest.getInventory().getItem(i))); + } founditem=true; break; }