diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index ff9ac062f..3fc67fdab 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -19,7 +19,6 @@ repositories { maven { url = uri("https://jitpack.io") } maven { url = uri("https://repo.destroystokyo.com/repository/maven-public//") } maven { url = uri("http://repo.dmulloy2.net/content/groups/public/") } - maven { url = uri("http://ci.ender.zone/plugin/repository/everything/") } maven { url = uri("https://repo.inventivetalent.org/content/groups/public/")} flatDir {dir(File("src/main/resources"))} } @@ -59,7 +58,6 @@ dependencies { "implementation"("org.inventivetalent:mapmanager:1.7.3-SNAPSHOT") { isTransitive = false } "implementation"("org.inventivetalent:mapmanager:1.7.3-SNAPSHOT") { isTransitive = false } - "implementation"("com.massivecraft:Factions:1.6.9.5-U0.2.1-SNAPSHOT") { isTransitive = false } "implementation"("com.github.TechFortress:GriefPrevention:16.12.0") { isTransitive = false } "implementation"("com.massivecraft:mcore:7.0.1") { isTransitive = false } "implementation"("com.bekvon.bukkit.residence:Residence:4.5._13.1") { isTransitive = false } diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java index 78eeec0b2..7bf592878 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java @@ -12,7 +12,6 @@ import com.boydti.fawe.bukkit.listener.CFIPacketListener; import com.boydti.fawe.bukkit.listener.ChunkListener_8; import com.boydti.fawe.bukkit.listener.ChunkListener_9; import com.boydti.fawe.bukkit.listener.RenderListener; -import com.boydti.fawe.bukkit.regions.FactionsUUIDFeature; import com.boydti.fawe.bukkit.regions.FreeBuildRegion; import com.boydti.fawe.bukkit.regions.GriefPreventionFeature; import com.boydti.fawe.bukkit.regions.ResidenceFeature; @@ -261,14 +260,6 @@ public class FaweBukkit implements IFawe, Listener { } catch (Throwable ignored) { } } - final Plugin factionsPlugin = Bukkit.getServer().getPluginManager().getPlugin("Factions"); - if (factionsPlugin != null && factionsPlugin.isEnabled()) { - try { - managers.add(new FactionsUUIDFeature(factionsPlugin, this)); - log.debug("Attempting to use plugin 'FactionsUUID'"); - } catch (Throwable ignored) { - } - } final Plugin residencePlugin = Bukkit.getServer().getPluginManager().getPlugin("Residence"); if (residencePlugin != null && residencePlugin.isEnabled()) { try { diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsUUIDFeature.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsUUIDFeature.java deleted file mode 100644 index 2e97337cd..000000000 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/regions/FactionsUUIDFeature.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.boydti.fawe.bukkit.regions; - -import com.boydti.fawe.bukkit.FaweBukkit; -import com.boydti.fawe.object.RegionWrapper; -import com.boydti.fawe.regions.FaweMask; -import com.boydti.fawe.util.Permission; -import com.massivecraft.factions.Board; -import com.massivecraft.factions.FLocation; -import com.massivecraft.factions.Faction; -import com.sk89q.worldedit.bukkit.BukkitAdapter; -import com.sk89q.worldedit.math.BlockVector3; -import org.bukkit.Chunk; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.event.Listener; -import org.bukkit.plugin.Plugin; - -public class FactionsUUIDFeature extends BukkitMaskManager implements Listener { - private final Board instance; - - public FactionsUUIDFeature(final Plugin factionsPlugin, final FaweBukkit p3) { - super(factionsPlugin.getName()); - this.instance = Board.getInstance(); - } - - @Override - public FaweMask getMask(final com.sk89q.worldedit.entity.Player p, MaskType type) { - final Player player = BukkitAdapter.adapt(p); - final Chunk chunk = player.getLocation().getChunk(); - final boolean perm = Permission.hasPermission(p, "fawe.factions.wilderness"); - final World world = player.getWorld(); - - RegionWrapper locs = new RegionWrapper(chunk.getX(), chunk.getX(), chunk.getZ(), chunk.getZ()); - - int count = 32; - - if (this.isAdded(locs, world, player, perm, type)) { - boolean hasPerm = true; - - while (hasPerm && count > 0) { - count--; - - hasPerm = false; - - RegionWrapper chunkSelection = new RegionWrapper(locs.maxX + 1, locs.maxX + 1, locs.minZ, locs.maxZ); - - if (this.isAdded(chunkSelection, world, player, perm, type)) { - locs = new RegionWrapper(locs.minX, locs.maxX + 1, locs.minZ, locs.maxZ); - hasPerm = true; - } - - chunkSelection = new RegionWrapper(locs.minX - 1, locs.minX - 1, locs.minZ, locs.maxZ); - - if (this.isAdded(chunkSelection, world, player, perm, type)) { - locs = new RegionWrapper(locs.minX - 1, locs.maxX, locs.minZ, locs.maxZ); - hasPerm = true; - } - - chunkSelection = new RegionWrapper(locs.minX, locs.maxX, locs.maxZ + 1, locs.maxZ + 1); - - if (this.isAdded(chunkSelection, world, player, perm, type)) { - locs = new RegionWrapper(locs.minX, locs.maxX, locs.minZ, locs.maxZ + 1); - hasPerm = true; - } - - chunkSelection = new RegionWrapper(locs.minX, locs.maxX, locs.minZ - 1, locs.minZ - 1); - - if (this.isAdded(chunkSelection, world, player, perm, type)) { - locs = new RegionWrapper(locs.minX, locs.maxX, locs.minZ - 1, locs.maxZ); - hasPerm = true; - } - } - - final BlockVector3 pos1 = BlockVector3.at(locs.minX << 4, 1, locs.minZ << 4); - final BlockVector3 pos2 = BlockVector3.at(15 + (locs.maxX << 4), 256, 15 + (locs.maxZ << 4)); - return new FaweMask(pos1,pos2); - } - return null; - } - - public boolean isAdded(final RegionWrapper locs, final World world, final Player player, final boolean perm, MaskType type) { - for (int x = locs.minX; x <= locs.maxX; x++) { - for (int z = locs.minZ; z <= locs.maxZ; z++) { - final Faction fac = this.instance.getFactionAt(new FLocation(world.getName(), x, z)); - if (fac == null) { - return false; - } - // TODO types - if (!fac.getOnlinePlayers().contains(player)) { - return false; - } - if (fac.isWilderness() && !perm) { - return false; - } - } - } - return true; - } -}