Upstream/EpicBuckets
1
0
Fork 0
mirror of https://github.com/songoda/EpicBuckets.git synced 2024-11-04 17:39:33 +01:00
Code Issues Projects Releases Wiki Activity

1.4.4, WG for 1.13 still needs to be fixed

Browse Source
This commit is contained in:
Niels Vergucht 2019-01-16 14:54:38 +01:00
parent 99af79a321
commit a90738e0b5
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -122,7 +122,7 @@
<url>http://nexus.hc.to/content/repositories/pub_releases</url> <url>http://nexus.hc.to/content/repositories/pub_releases</url>
</repository> </repository>
<repository> <repository>
<id>3_aikar</id> <id>33_aikar</id>
<url>https://repo.aikar.co/content/groups/aikar/</url> <url>https://repo.aikar.co/content/groups/aikar/</url>
</repository> </repository>
<repository> <repository>

9
src/main/java/com/songoda/epicbuckets/file/ConfigManager.java
View File

@ -7,8 +7,10 @@ import com.songoda.epicbuckets.util.Validator;
import com.songoda.epicbuckets.util.XMaterial; import com.songoda.epicbuckets.util.XMaterial;
import me.lucko.helper.cooldown.Cooldown; import me.lucko.helper.cooldown.Cooldown;
import me.lucko.helper.cooldown.CooldownMap; import me.lucko.helper.cooldown.CooldownMap;
import me.lucko.helper.item.ItemStackBuilder;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Item;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -379,7 +381,12 @@ public class ConfigManager {
} }
public double getInfiniteUseCostForGenbucketType(GenbucketType genbucketType, ItemStack item) { public double getInfiniteUseCostForGenbucketType(GenbucketType genbucketType, ItemStack item) {
return infiniteUseCost.get(genbucketType).get(item); for (ItemStack itemStack : infiniteUseCost.get(genbucketType).keySet()) {
if (itemStack.getType() == item.getType() && itemStack.getData() == item.getData()) {
return infiniteUseCost.get(genbucketType).get(itemStack);
}
}
return 0;
} }
public int getGenbucketDelay() { public int getGenbucketDelay() {

4
src/main/java/com/songoda/epicbuckets/gui/GUISettings.java
View File

@ -31,6 +31,10 @@ public class GUISettings implements InventoryProvider {
.name("&6Hooks") .name("&6Hooks")
.build(), .build(),
e -> GUISettingsGenbucket.SETTINGS.open(player))); e -> GUISettingsGenbucket.SETTINGS.open(player)));
contents.add(ClickableItem.of(ItemStackBuilder.of(XMaterial.CHEST.parseMaterial())
.name("&6Shop settings")
.build(),
e -> GUISettingsGenbucket.SETTINGS.open(player)));
} }
@Override @Override

10
src/main/java/com/songoda/epicbuckets/regionhandler/FactionsMassive.java
View File

@ -1,6 +1,7 @@
package com.songoda.epicbuckets.regionhandler; package com.songoda.epicbuckets.regionhandler;
import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PS;
@ -11,12 +12,17 @@ import org.bukkit.entity.Player;
public class FactionsMassive { public class FactionsMassive {
public static boolean check(Player player, Location location) { public static boolean check(Player player, Location location) {
Faction f = BoardColl.get().getFactionAt(PS.valueOf(location));
/* /*
If wilderness If wilderness
*/ */
if (BoardColl.get().getFactionAt(PS.valueOf(location)) == FactionColl.get().getNone()) return EpicBuckets.getInstance().getConfigManager().isGensInWilderness(); if (f == FactionColl.get().getNone()) return EpicBuckets.getInstance().getConfigManager().isGensInWilderness();
return MPlayer.get(player).isInOwnTerritory(); /*
If player has no faction
*/
if (!MPlayer.get(player).hasFaction()) return false;
return MPlayer.get(player).getFactionName().equals(f.getName());
} }
} }