Mirrors/ArmorStandTools
3
0
Fork 0
Mirror von https://github.com/St3venAU/ArmorStandTools.git synchronisiert 2024-12-28 12:30:07 +01:00
Code Issues Pakete Projekte Releases Wiki Aktivität

Merge pull request #19 from PhanaticD/patch-1

Quellcode durchsuchen 
make work with plotsquared breaking branch
Dieser Commit ist enthalten in:
St3venAU 2019-03-15 15:34:28 +08:00 committet von GitHub
Commit 82d3e26b58
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 14 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

20
src/com/gmail/St3venAU/plugins/ArmorStandTools/PlotSquaredHook.java
Datei anzeigen

@ -1,8 +1,10 @@
package com.gmail.St3venAU.plugins.ArmorStandTools; package com.gmail.St3venAU.plugins.ArmorStandTools;
import com.intellectualcrafters.plot.api.PlotAPI; import com.github.intellectualsites.plotsquared.api.PlotAPI;
import com.intellectualcrafters.plot.object.Plot; import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
import com.intellectualcrafters.plot.object.PlotPlayer; import com.github.intellectualsites.plotsquared.plot.object.Plot;
import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -10,7 +12,7 @@ import java.util.UUID;
class PlotSquaredHook { class PlotSquaredHook {
public static PlotAPI api = null; public static PlotAPI api;
private static Main plugin; private static Main plugin;
public PlotSquaredHook(Main main) { public PlotSquaredHook(Main main) {
@ -22,8 +24,14 @@ class PlotSquaredHook {
return api.getPlotSquared().hasPlotArea(loc.getWorld().getName()); return api.getPlotSquared().hasPlotArea(loc.getWorld().getName());
} }
public static boolean checkPermission(Player player, Location loc) { public static boolean checkPermission(Player player, Location location) {
Plot plot = api.getPlot(loc); com.github.intellectualsites.plotsquared.plot.object.Location plotLocation = BukkitUtil.getLocation(location);
PlotArea plotArea = plotLocation.getPlotArea();
if(plotArea == null) {
plugin.debug("plots.admin.build.road: " + player.hasPermission("plots.admin.build.road"));
return player.hasPermission("plots.admin.build.road");
}
Plot plot = plotArea.getPlot(plotLocation);
PlotPlayer pp = PlotPlayer.wrap(player); PlotPlayer pp = PlotPlayer.wrap(player);
plugin.debug("Plot: " + plot); plugin.debug("Plot: " + plot);
if (plot == null) { if (plot == null) {