Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-01-05 23:37:39 +01:00
Code Issues Projects Releases Wiki Activity

Add option to ignore Item lore in challenges

Browse Source
This commit is contained in:
Fabrizio La Rosa 2020-06-26 21:22:56 +02:00
parent a41b7d27b4
commit b1be709c3c
2 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/com/songoda/skyblock/challenge/challenge/Challenge.java
View File

@ -5,6 +5,7 @@ import com.songoda.core.hooks.EconomyManager;
import com.songoda.skyblock.SkyBlock;
import com.songoda.skyblock.bank.BankManager;
import com.songoda.skyblock.island.Island;
import com.songoda.skyblock.utils.item.ItemStackUtil;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Entity;
@ -16,6 +17,7 @@ import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionType;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -149,35 +151,55 @@ public class Challenge {
@Override
public boolean has(Player p, Object obj) {
// Check if player has specific item in his inventory
ItemStack is = (ItemStack) obj;
return p.getInventory().containsAtLeast(new ItemStack(is.getType()), is.getAmount());
boolean ignoreLore = SkyBlock.getInstance().getFileManager()
.getConfig(new File(SkyBlock.getInstance().getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Island.Challenge.IgnoreItemLore", false);
if(obj instanceof ItemStack){
// Check if player has specific item in his inventory
ItemStack is = (ItemStack) obj;
if(ignoreLore){
return p.getInventory().contains(is.getType(), is.getAmount());
}
return p.getInventory().containsAtLeast(new ItemStack(is.getType()), is.getAmount());
}
return false;
}
@Override
public void executeRequire(Player p, Object obj) {
boolean ignoreLore = SkyBlock.getInstance().getFileManager()
.getConfig(new File(SkyBlock.getInstance().getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Island.Challenge.IgnoreItemLore", false);
if(obj instanceof ItemStack){
// Remove specific item in player's inventory
ItemStack is = (ItemStack) obj;
//p.getInventory().removeItem(new ItemStack(is.getType(), is.getAmount()));
int toRemove = is.getAmount();
for(ItemStack jis : p.getInventory().getContents()) {
if(jis != null && jis.isSimilar(is)) {
if(jis.getAmount() <= toRemove) {
toRemove -= jis.getAmount();
jis.setAmount(0);
if(jis != null) {
boolean isItem;
if(ignoreLore){
isItem = jis.getType().equals(is.getType());
} else {
jis.setAmount(jis.getAmount() - toRemove);
toRemove = 0;
isItem = jis.isSimilar(is);
}
if(isItem) {
if(jis.getAmount() <= toRemove) {
toRemove -= jis.getAmount();
jis.setAmount(0);
} else {
jis.setAmount(jis.getAmount() - toRemove);
toRemove = 0;
}
}
if(toRemove <= 0) {
p.updateInventory();
break;
}
}
if(toRemove <= 0) {
p.updateInventory();
break;
}
}
}
// TODO LOG
}
@Override
@ -188,7 +210,6 @@ public class Challenge {
.addItem(new ItemStack(is.getType(), is.getAmount()));
for (ItemStack restIs : rest.values())
p.getWorld().dropItem(p.getLocation(), restIs);
// TODO LOG
}
},
CMD {

6
src/main/resources/config.yml
View File

@ -331,8 +331,10 @@ Island:
Challenge:
# Enable or disable challenges. Configuration for challenges are in challenges.yml file
Enable: true
# Disabling this will make challenges per player
PerIsland: true
# Whether challenges should be per-island or per-player
PerIsland: false
# Whether to ignore item lore in requirements
IgnoreItemLore: false
Teleport:
# Enable or disable Fall damage
FallDamage: true