Upstream/EpicBosses
1
0
Fork 0
mirror of https://github.com/songoda/EpicBosses.git synced 2025-01-23 07:11:28 +01:00
Code Issues Projects Releases Wiki Activity

1.0.0-SNAPSHOT-U65

Browse Source 
+ Removed need for NBTFactory
+ Added an ignore for players in creative/spectator for targeting
This commit is contained in:
Charles 2018-11-19 15:49:50 +08:00
parent 21cd7c02ec
commit 33c5438445
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugin-modules/Core/src/com/songoda/epicbosses/targeting/TargetHandler.java
View File

@ -4,6 +4,7 @@ import com.songoda.epicbosses.holder.IActiveHolder;
import com.songoda.epicbosses.managers.BossTargetManager;
import com.songoda.epicbosses.utils.ServerUtils;
import lombok.Getter;
import org.bukkit.GameMode;
import org.bukkit.entity.Creature;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
@ -59,7 +60,7 @@ public abstract class TargetHandler<Holder extends IActiveHolder> implements ITa
if(livingEntity instanceof Player) {
Player player = (Player) livingEntity;
if(player.getGameMode() == GameMode.SPECTATOR || player.getGameMode() == GameMode.CREATIVE) continue;
}
nearbyEntities.add(livingEntity);

7
plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackConverter.java
View File

@ -2,7 +2,6 @@ package com.songoda.epicbosses.utils.itemstack;
import com.songoda.epicbosses.utils.IReplaceableConverter;
import com.songoda.epicbosses.utils.StringUtils;
import com.songoda.epicbosses.utils.factory.NbtFactory;
import com.songoda.epicbosses.utils.itemstack.converters.EnchantConverter;
import com.songoda.epicbosses.utils.itemstack.converters.MaterialConverter;
import com.songoda.epicbosses.utils.itemstack.holder.ItemStackHolder;
@ -170,11 +169,7 @@ public class ItemStackConverter implements IReplaceableConverter<ItemStackHolder
}
if(isGlowing != null && isGlowing) {
ItemStack craftStack = NbtFactory.getCraftItemStack(itemStack);
NbtFactory.NbtCompound compound = NbtFactory.fromItemTag(craftStack);
compound.put("ench", NbtFactory.createList());
return craftStack;
//TODO
}
if(amount != null && amount > 1) {

20
plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackUtils.java
View File

@ -2,7 +2,7 @@ package com.songoda.epicbosses.utils.itemstack;
import com.songoda.epicbosses.utils.NumberUtils;
import com.songoda.epicbosses.utils.StringUtils;
import com.songoda.epicbosses.utils.factory.NbtFactory;
//import com.songoda.epicbosses.utils.factory.NbtFactory;
import com.songoda.epicbosses.utils.itemstack.enchants.GlowEnchant;
import com.songoda.epicbosses.utils.itemstack.holder.ItemStackHolder;
import org.bukkit.ChatColor;
@ -62,14 +62,16 @@ public class ItemStackUtils {
if(compoundData == null || compoundData.isEmpty()) return cloneStack;
ItemStack craftStack = NbtFactory.getCraftItemStack(cloneStack);
NbtFactory.NbtCompound compound = NbtFactory.fromItemTag(craftStack);
for(String s : compoundData.keySet()) {
compound.put(s, compoundData.get(s));
}
return craftStack;
// TODO
// ItemStack craftStack = NbtFactory.getCraftItemStack(cloneStack);
// NbtFactory.NbtCompound compound = NbtFactory.fromItemTag(craftStack);
//
// for(String s : compoundData.keySet()) {
// compound.put(s, compoundData.get(s));
// }
//
// return craftStack;
return cloneStack;
}
public static ItemStack createItemStack(ConfigurationSection configurationSection) {

2
pom.xml
View File

@ -19,7 +19,7 @@
</modules>
<properties>
<plugin.version>maven-version-number-SNAPSHOT-U64</plugin.version>
<plugin.version>maven-version-number-SNAPSHOT-U65</plugin.version>
<plugin.name>EpicBosses</plugin.name>
<plugin.main>com.songoda.epicbosses.CustomBosses</plugin.main>
<plugin.author>AMinecraftDev</plugin.author>