Upstream/EpicBuckets
1
0
Fork 0
mirror of https://github.com/songoda/EpicBuckets.git synced 2024-11-25 19:56:22 +01:00
Code Issues Projects Releases Wiki Activity

Fixed permissions & infinite use

Browse Source
This commit is contained in:
Niels Vergucht 2018-12-15 23:20:18 +01:00
parent 2d84c7c32a
commit 8f7c6c1165
4 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>EpicBuckets</artifactId> <artifactId>EpicBuckets</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.2.3</version> <version>1.2.4</version>
<build> <build>
<defaultGoal>clean package</defaultGoal> <defaultGoal>clean package</defaultGoal>
<plugins> <plugins>

8
src/main/java/com/songoda/epicbuckets/command/CommandGenbucket.java
View File

@ -41,14 +41,14 @@ public class CommandGenbucket extends BaseCommand {
@Default @Default
@Description("Opens up the Genbucket shop") @Description("Opens up the Genbucket shop")
public void shop(Player player) { public void shop(Player player) {
if (!permCheck(player, "genbucket.shop")) return; if (!permCheck(player, "epicbuckets.shop")) return;
new GUIMain(player).open(); new GUIMain(player).open();
} }
@Subcommand("reload") @Subcommand("reload")
@Description("Reloads the messages & config files") @Description("Reloads the messages & config files")
public void reload(Player player) { public void reload(Player player) {
if (!permCheck(player, "genbucket.reload")) return; if (!permCheck(player, "epicbuckets.reload")) return;
epicBuckets.reload(); epicBuckets.reload();
player.sendMessage(ChatUtil.colorPrefix(epicBuckets.getLocale().getMessage("command.reload.success"))); player.sendMessage(ChatUtil.colorPrefix(epicBuckets.getLocale().getMessage("command.reload.success")));
} }
@ -56,14 +56,14 @@ public class CommandGenbucket extends BaseCommand {
@Subcommand("admin toggle") @Subcommand("admin toggle")
@Description("Toggles your admin status to receive genbucket placement notifications") @Description("Toggles your admin status to receive genbucket placement notifications")
public void admin(Player player) { public void admin(Player player) {
if (!permCheck(player, "genbucket.admin") || !permCheck(player, "genbucket.admin.toggle")) return; if (!permCheck(player, "epicbuckets.admin") || !permCheck(player, "epicbuckets.admin.toggle")) return;
epicBuckets.getGenbucketManager().toggleAdmin(player); epicBuckets.getGenbucketManager().toggleAdmin(player);
} }
@Subcommand("admin panel") @Subcommand("admin panel")
@Description("Opens up the panel with all the active genbuckets") @Description("Opens up the panel with all the active genbuckets")
public void panel(Player player) { public void panel(Player player) {
if (!permCheck(player, "genbucket.admin") || !permCheck(player, "genbucket.admin.panel")) return; if (!permCheck(player, "epicbuckets.admin") || !permCheck(player, "epicbuckets.admin.panel")) return;
GUIPanel.PANEL.open(player); GUIPanel.PANEL.open(player);
} }

4
src/main/java/com/songoda/epicbuckets/listener/GenbucketPlaceListener.java
View File

@ -38,7 +38,7 @@ public class GenbucketPlaceListener implements Listener {
e.setCancelled(true); e.setCancelled(true);
if (!e.getPlayer().hasPermission("genbucket.place")) { if (!e.getPlayer().hasPermission("epicbuckets.place")) {
e.getPlayer().sendMessage(EpicBuckets.getInstance().getLocale().getMessage("event.place.nothere")); e.getPlayer().sendMessage(EpicBuckets.getInstance().getLocale().getMessage("event.place.nothere"));
return; return;
} }
@ -80,7 +80,7 @@ public class GenbucketPlaceListener implements Listener {
return; return;
} }
if (e.getPlayer().getGameMode() != GameMode.CREATIVE || !EpicBuckets.getInstance().getConfigManager().isUnlimitedGenbuckets()) { if (e.getPlayer().getGameMode() != GameMode.CREATIVE && !EpicBuckets.getInstance().getConfigManager().isUnlimitedGenbuckets()) {
if (e.getItem().getAmount() > 1) { if (e.getItem().getAmount() > 1) {
e.getItem().setAmount(e.getItem().getAmount() - 1); e.getItem().setAmount(e.getItem().getAmount() - 1);
} else { } else {

23
src/main/java/com/songoda/epicbuckets/regionhandler/RegionMassiveCraftFactions.java
View File

@ -1,23 +0,0 @@
package com.songoda.epicbuckets.regionhandler;
import com.massivecraft.factions.*;
import com.songoda.epicbuckets.EpicBuckets;
import org.bukkit.Location;
import org.bukkit.entity.Player;
public class RegionMassiveCraftFactions {
public static boolean canBuild(Player player, Location location) {
if (!EpicBuckets.getInstance().getConfigManager().isSupportFactions()) return true;
if (!EpicBuckets.getInstance().getServer().getPluginManager().isPluginEnabled("Factions")) return true;
Faction f = Board.getInstance().getFactionAt(new FLocation(location));
if (f == null) return false;
if (FPlayers.getInstance().getByPlayer(player).getFaction() != f) return false;
return true;
}
}