amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-22 10:22:29 +00:00
Code Issues Projects Releases Wiki Activity

Added debug messages for shop creation (external plugins)

Browse Source
This commit is contained in:
Eric 2017-04-19 14:04:57 +02:00
parent d34e5f809f
commit a4886c8cbb
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java
View File

@ -115,7 +115,10 @@ public class ShopInteractListener implements Listener {
chestLocations[1] = ((Chest) dc.getRightSide()).getLocation(); chestLocations[1] = ((Chest) dc.getRightSide()).getLocation();
} }
String denyReason = "Event Cancelled";
if (plugin.hasWorldGuard() && config.enable_worldguard_integration) { if (plugin.hasWorldGuard() && config.enable_worldguard_integration) {
plugin.debug("Checking if WorldGuard allows shop creation...");
RegionContainer container = worldGuard.getRegionContainer(); RegionContainer container = worldGuard.getRegionContainer();
RegionQuery query = container.createQuery(); RegionQuery query = container.createQuery();
@ -124,35 +127,51 @@ public class ShopInteractListener implements Listener {
externalPluginsAllowed &= query.testState(loc, p, WorldGuardShopFlag.CREATE_SHOP); externalPluginsAllowed &= query.testState(loc, p, WorldGuardShopFlag.CREATE_SHOP);
} }
} }
if (!externalPluginsAllowed) denyReason = "WorldGuard";
} }
if (plugin.hasTowny() && config.enable_towny_integration) { if (externalPluginsAllowed && plugin.hasTowny() && config.enable_towny_integration) {
plugin.debug("Checking if Towny allows shop creation...");
for (Location loc : chestLocations) { for (Location loc : chestLocations) {
if (loc != null) { if (loc != null) {
TownBlock townBlock = TownyUniverse.getTownBlock(loc); TownBlock townBlock = TownyUniverse.getTownBlock(loc);
if (townBlock != null) { if (townBlock != null) {
plugin.debug("Plot Type is " + townBlock.getType().name());
try { try {
Town town = townBlock.getTown(); Town town = townBlock.getTown();
boolean residentFound = false;
for (Resident resident : town.getResidents()) { for (Resident resident : town.getResidents()) {
if (resident.getName().equals(p.getName())) { if (resident.getName().equals(p.getName())) {
residentFound = true;
if (resident.isMayor()) { if (resident.isMayor()) {
plugin.debug(p.getName() + " is mayor of town");
externalPluginsAllowed &= (config.towny_shop_plots_mayor.contains(townBlock.getType().name())); externalPluginsAllowed &= (config.towny_shop_plots_mayor.contains(townBlock.getType().name()));
} else if (resident.isKing()) { } else if (resident.isKing()) {
plugin.debug(p.getName() + " is king of town");
externalPluginsAllowed &= (config.towny_shop_plots_king.contains(townBlock.getType().name())); externalPluginsAllowed &= (config.towny_shop_plots_king.contains(townBlock.getType().name()));
} else { } else {
plugin.debug(p.getName() + " is resident in town");
externalPluginsAllowed &= (config.towny_shop_plots_residents.contains(townBlock.getType().name())); externalPluginsAllowed &= (config.towny_shop_plots_residents.contains(townBlock.getType().name()));
} }
} }
} }
if (!residentFound) {
plugin.debug(p.getName() + " is not resident in town");
externalPluginsAllowed &= false;
}
} catch (Exception ex) { } catch (Exception ex) {
plugin.debug(ex); plugin.debug(ex);
} }
} }
} }
} }
if (!externalPluginsAllowed) denyReason = "Towny";
} }
if (plugin.hasPlotSquared() && config.enable_plotsquared_integration) { if (externalPluginsAllowed && plugin.hasPlotSquared() && config.enable_plotsquared_integration) {
plugin.debug("Checking if PlotSquared allows shop creation...");
for (Location loc : chestLocations) { for (Location loc : chestLocations) {
if (loc != null) { if (loc != null) {
com.intellectualcrafters.plot.object.Location plotLocation = new com.intellectualcrafters.plot.object.Location( com.intellectualcrafters.plot.object.Location plotLocation = new com.intellectualcrafters.plot.object.Location(
@ -162,44 +181,58 @@ public class ShopInteractListener implements Listener {
externalPluginsAllowed &= Utils.isFlagAllowedOnPlot(plot, PlotSquaredShopFlag.CREATE_SHOP, p); externalPluginsAllowed &= Utils.isFlagAllowedOnPlot(plot, PlotSquaredShopFlag.CREATE_SHOP, p);
} }
} }
if (!externalPluginsAllowed) denyReason = "PlotSquared";
} }
if (plugin.hasUSkyBlock() && config.enable_uskyblock_integration) { if (externalPluginsAllowed && plugin.hasUSkyBlock() && config.enable_uskyblock_integration) {
plugin.debug("Checking if uSkyBlock allows shop creation...");
for (Location loc : chestLocations) { for (Location loc : chestLocations) {
if (loc != null) { if (loc != null) {
IslandInfo islandInfo = plugin.getUSkyBlock().getIslandInfo(loc); IslandInfo islandInfo = plugin.getUSkyBlock().getIslandInfo(loc);
if (islandInfo != null) { if (islandInfo != null) {
plugin.debug("Chest is on island of " + islandInfo.getLeader());
externalPluginsAllowed &= islandInfo.getMembers().contains(p.getName()) || islandInfo.getLeader().equals(p.getName()); externalPluginsAllowed &= islandInfo.getMembers().contains(p.getName()) || islandInfo.getLeader().equals(p.getName());
} }
} }
} }
if (!externalPluginsAllowed) denyReason = "uSkyBlock";
} }
if (plugin.hasASkyBlock() && config.enable_askyblock_integration) { if (externalPluginsAllowed && plugin.hasASkyBlock() && config.enable_askyblock_integration) {
plugin.debug("Checking if ASkyBlock allows shop creation...");
for (Location loc : chestLocations) { for (Location loc : chestLocations) {
if (loc != null) { if (loc != null) {
Island island = ASkyBlockAPI.getInstance().getIslandAt(loc); Island island = ASkyBlockAPI.getInstance().getIslandAt(loc);
if (island != null) { if (island != null) {
plugin.debug("Chest is on island of " + Bukkit.getOfflinePlayer(island.getOwner()).getName());
externalPluginsAllowed &= island.getMembers().contains(p.getUniqueId()) || island.getOwner().equals(p.getUniqueId()); externalPluginsAllowed &= island.getMembers().contains(p.getUniqueId()) || island.getOwner().equals(p.getUniqueId());
} }
} }
} }
if (!externalPluginsAllowed) denyReason = "ASkyBlock";
} }
if (plugin.hasIslandWorld() && config.enable_islandworld_integration && IslandWorldApi.isInitialized()) { if (externalPluginsAllowed && plugin.hasIslandWorld() && config.enable_islandworld_integration && IslandWorldApi.isInitialized()) {
plugin.debug("Checking if IslandWorld allows shop creation...");
for (Location loc : chestLocations) { for (Location loc : chestLocations) {
if (loc != null) { if (loc != null) {
if (loc.getWorld().getName().equals(IslandWorldApi.getIslandWorld().getName())) { if (loc.getWorld().getName().equals(IslandWorldApi.getIslandWorld().getName())) {
plugin.debug("Chest is in island world");
externalPluginsAllowed &= IslandWorldApi.canBuildOnLocation(p, loc, true); externalPluginsAllowed &= IslandWorldApi.canBuildOnLocation(p, loc, true);
} }
} }
} }
if (!externalPluginsAllowed) denyReason = "IslandWorld";
} }
if ((e.isCancelled() || !externalPluginsAllowed) && !p.hasPermission(Permissions.CREATE_PROTECTED)) { if ((e.isCancelled() || !externalPluginsAllowed) && !p.hasPermission(Permissions.CREATE_PROTECTED)) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_CREATE_PROTECTED)); p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_CREATE_PROTECTED));
ClickType.removePlayerClickType(p); ClickType.removePlayerClickType(p);
plugin.debug(p.getName() + " is not allowed to create a shop on the selected chest"); plugin.debug(p.getName() + " is not allowed to create a shop on the selected chest because " + denyReason);
e.setCancelled(true); e.setCancelled(true);
return; return;
} }

5
src/main/java/de/epiceric/shopchest/utils/Utils.java
View File

@ -5,7 +5,6 @@ import com.intellectualcrafters.plot.object.Plot;
import de.epiceric.shopchest.ShopChest; import de.epiceric.shopchest.ShopChest;
import de.epiceric.shopchest.external.PlotSquaredShopFlag; import de.epiceric.shopchest.external.PlotSquaredShopFlag;
import de.epiceric.shopchest.nms.CustomBookMeta; import de.epiceric.shopchest.nms.CustomBookMeta;
import de.epiceric.shopchest.shop.Shop;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.InvalidConfigurationException;
@ -236,6 +235,8 @@ public class Utils {
if (o instanceof PlotSquaredShopFlag.Group) { if (o instanceof PlotSquaredShopFlag.Group) {
PlotSquaredShopFlag.Group group = (PlotSquaredShopFlag.Group) o; PlotSquaredShopFlag.Group group = (PlotSquaredShopFlag.Group) o;
ShopChest.getInstance().debug("Flag " + flag.getName() + " is set to " + group);
switch (group) { switch (group) {
case OWNERS: case OWNERS:
return plot.getOwners().contains(p.getUniqueId()); return plot.getOwners().contains(p.getUniqueId());
@ -251,6 +252,8 @@ public class Utils {
} }
} }
ShopChest.getInstance().debug("Flag or plot is null, or value of flag is not a group");
return true; return true;
} }