Make damage labels invulnerable.

This commit is contained in:
sigonasr2 2017-10-11 22:54:04 -05:00
parent 6552cc9e3d
commit 7cc2b9a7e2
4 changed files with 7 additions and 6 deletions

Binary file not shown.

View File

@ -5841,14 +5841,14 @@ public class GenericFunctions {
for (String key : map.keySet()) { for (String key : map.keySet()) {
List<ItemContainer> list = map.get(key); List<ItemContainer> list = map.get(key);
if (discordOutput) { if (discordOutput) {
sb.append("Items in **"+key+"**:\n\n"); sb.append("Items in **"+key+"**:\n\n```");
} else { } else {
sb.append("Items in "+ChatColor.BOLD+key+ChatColor.RESET+":\n\n"); sb.append("Items in "+ChatColor.BOLD+key+ChatColor.RESET+":\n\n");
} }
for (int i=0;i<list.size();i++) { for (int i=0;i<list.size();i++) {
sb.append(ChatColor.GRAY+GenericFunctions.UserFriendlyMaterialName(list.get(i).getItem())+(TwosideKeeperAPI.isSetItem(list.get(i).getItem())?" (T"+TwosideKeeperAPI.getItemTier(list.get(i).getItem())+")":"")+(list.get(i).getAmount()>1?ChatColor.YELLOW+" x"+list.get(i).getAmount():"")+ChatColor.RESET+(i+1!=list.size()?", ":"")); sb.append(ChatColor.GRAY+GenericFunctions.UserFriendlyMaterialName(list.get(i).getItem())+(TwosideKeeperAPI.isSetItem(list.get(i).getItem())?" (T"+TwosideKeeperAPI.getItemTier(list.get(i).getItem())+")":"")+(list.get(i).getAmount()>1?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) { if (sb.length()==0) {
sb.append("Could not find any items!"); sb.append("Could not find any items!");

View File

@ -92,6 +92,7 @@ public class EntityUtils {
aec.setCustomNameVisible(true); aec.setCustomNameVisible(true);
aec.setVisible(false); aec.setVisible(false);
aec.setMarker(true); aec.setMarker(true);
aec.setInvulnerable(true);
//aec.setRadius(0); //aec.setRadius(0);
//aec.setParticle(Particle.ITEM_TAKE); //aec.setParticle(Particle.ITEM_TAKE);
//Bukkit.getScheduler().runTaskLater(TwosideKeeper.plugin,new CloudRunnable(aec,0.15,10),1); //Bukkit.getScheduler().runTaskLater(TwosideKeeper.plugin,new CloudRunnable(aec,0.15,10),1);

View File

@ -1431,10 +1431,10 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
HashMap<String,List<ItemStack>> recyclingCenterItems = populateRecyclingCenterItems(); HashMap<String,List<ItemStack>> recyclingCenterItems = populateRecyclingCenterItems();
if (args.length==1) { if (args.length==1) {
//Get a master list of all Recycling Center items. //Get a master list of all Recycling Center items.
aPlugin.API.discordSendRaw("```\n"+ aPlugin.API.discordSendRaw("\n"+
GenericFunctions.generateItemList( GenericFunctions.generateItemList(
GenericFunctions.getItemList(recyclingCenterItems) GenericFunctions.getItemList(recyclingCenterItems)
,null,true)+"\n```" ,null,true)+"\n"
); );
} else { } else {
//Try to use the search phrase given. //Try to use the search phrase given.
@ -1443,11 +1443,11 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
newargs[i-1]=args[i]; newargs[i-1]=args[i];
} }
args = newargs; args = newargs;
aPlugin.API.discordSendRaw("```\n"+ aPlugin.API.discordSendRaw("\n"+
GenericFunctions.generateItemList( GenericFunctions.generateItemList(
GenericFunctions.getItemList(recyclingCenterItems) GenericFunctions.getItemList(recyclingCenterItems)
,args, true ,args, true
)+"\n```" )+"\n"
); );
} }
},"search"); },"search");