Upstream/UltimateKits
1
0
Fork 0
mirror of https://github.com/songoda/UltimateKits.git synced 2024-07-03 01:54:46 +02:00
Code Issues Projects Releases Wiki Activity

Fixed kit items resetting.

Browse Source
This commit is contained in:
Lilac 2019-09-07 21:43:06 +01:00
parent 37672b9e3f
commit 156ad084c1
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/ultimatekits/UltimateKits.java
View File

@ -175,7 +175,7 @@ public class UltimateKits extends JavaPlugin {
this.dataManager.getBlockData((blockData) -> { this.dataManager.getBlockData((blockData) -> {
this.kitManager.setKitLocations(blockData); this.kitManager.setKitLocations(blockData);
kitManager.getKitLocations().forEach((location, data) -> { kitManager.getKitLocations().forEach((location, data) -> {
UltimateKits.getInstance().getHologram().add(data); if (hologram != null) UltimateKits.getInstance().getHologram().add(data);
}); });
}); });
}, 20L); }, 20L);

2
src/main/java/com/songoda/ultimatekits/handlers/DisplayItemHandler.java
View File

@ -40,6 +40,8 @@ public class DisplayItemHandler {
Kit kit = kitBlockData.getKit(); Kit kit = kitBlockData.getKit();
if (kit.getReadableContents(null, false, false, false) == null) return;
List<ItemStack> list = kit.getReadableContents(null, false, false, false); List<ItemStack> list = kit.getReadableContents(null, false, false, false);
if (list.isEmpty()) return; if (list.isEmpty()) return;
for (Entity e : location.getChunk().getEntities()) { for (Entity e : location.getChunk().getEntities()) {

8
src/main/java/com/songoda/ultimatekits/kit/KitItem.java
View File

@ -7,6 +7,7 @@ import com.songoda.ultimatekits.kit.type.KitContentEconomy;
import com.songoda.ultimatekits.kit.type.KitContentItem; import com.songoda.ultimatekits.kit.type.KitContentItem;
import com.songoda.ultimatekits.utils.Methods; import com.songoda.ultimatekits.utils.Methods;
import com.songoda.ultimatekits.utils.settings.Setting; import com.songoda.ultimatekits.utils.settings.Setting;
import org.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
@ -156,8 +157,11 @@ public class KitItem {
ItemStack item = content.getItemForDisplay(); ItemStack item = content.getItemForDisplay();
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
if (chance != 0 || displayItem != null || displayName != null || displayLore != null) { if (chance != 0 || displayItem != null || displayName != null || displayLore != null) {
meta.setDisplayName(meta.hasDisplayName() ? Methods.convertToInvisibleString(compileOptions() + ";") String capitalizedName = meta.hasDisplayName() ? meta.getDisplayName() :
+ meta.getDisplayName() : Methods.convertToInvisibleString(compileOptions() + ";faqe") + item.getType().name().replace("_", " ")); WordUtils.capitalize(item.getType().toString().toLowerCase().replace("_", " "));
if (capitalizedName.contains(Methods.convertToInvisibleString(";faqe")))
capitalizedName = meta.getDisplayName().split(Methods.convertToInvisibleString(";faqe"))[1];
meta.setDisplayName(Methods.convertToInvisibleString(compileOptions() + ";faqe") + ChatColor.RESET + capitalizedName);
} }
item.setItemMeta(meta); item.setItemMeta(meta);
return item; return item;