diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index d255ce9..150006b 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java index b94d77c..994c9b1 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java @@ -5841,14 +5841,14 @@ public class GenericFunctions { for (String key : map.keySet()) { List list = map.get(key); if (discordOutput) { - sb.append("Items in **"+key+"**:\n\n"); + sb.append("Items in **"+key+"**:\n\n```"); } else { sb.append("Items in "+ChatColor.BOLD+key+ChatColor.RESET+":\n\n"); } for (int i=0;i1?ChatColor.YELLOW+" x"+list.get(i).getAmount():"")+ChatColor.RESET+(i+1!=list.size()?", ":"")); } - sb.append("\n ___________________ \n"); + sb.append((discordOutput)?"```":""+"\n ___________________ \n"); } if (sb.length()==0) { sb.append("Could not find any items!"); diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Utils/EntityUtils.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Utils/EntityUtils.java index 2b59dec..3220238 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Utils/EntityUtils.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Utils/EntityUtils.java @@ -92,6 +92,7 @@ public class EntityUtils { aec.setCustomNameVisible(true); aec.setVisible(false); aec.setMarker(true); + aec.setInvulnerable(true); //aec.setRadius(0); //aec.setParticle(Particle.ITEM_TAKE); //Bukkit.getScheduler().runTaskLater(TwosideKeeper.plugin,new CloudRunnable(aec,0.15,10),1); diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index e56d582..eb4c0dd 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -1431,10 +1431,10 @@ public class TwosideKeeper extends JavaPlugin implements Listener { HashMap> recyclingCenterItems = populateRecyclingCenterItems(); if (args.length==1) { //Get a master list of all Recycling Center items. - aPlugin.API.discordSendRaw("```\n"+ + aPlugin.API.discordSendRaw("\n"+ GenericFunctions.generateItemList( GenericFunctions.getItemList(recyclingCenterItems) - ,null,true)+"\n```" + ,null,true)+"\n" ); } else { //Try to use the search phrase given. @@ -1443,11 +1443,11 @@ public class TwosideKeeper extends JavaPlugin implements Listener { newargs[i-1]=args[i]; } args = newargs; - aPlugin.API.discordSendRaw("```\n"+ + aPlugin.API.discordSendRaw("\n"+ GenericFunctions.generateItemList( GenericFunctions.getItemList(recyclingCenterItems) ,args, true - )+"\n```" + )+"\n" ); } },"search");