Updated FabledSkyblock integration

This commit is contained in:
Auxilor
2023-10-16 22:23:32 +01:00
committed by _OfTeN_
parent de6a3e76fd
commit 80cdaf6ea0
3 changed files with 6 additions and 8 deletions

View File

@@ -1,20 +1,22 @@
package com.willfp.eco.internal.spigot.integrations.antigrief package com.willfp.eco.internal.spigot.integrations.antigrief
import com.songoda.skyblock.SkyBlock import com.craftaro.skyblock.SkyBlock
import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration
import org.bukkit.Location import org.bukkit.Location
import org.bukkit.block.Block import org.bukkit.block.Block
import org.bukkit.entity.LivingEntity import org.bukkit.entity.LivingEntity
import org.bukkit.entity.Monster import org.bukkit.entity.Monster
import org.bukkit.entity.Player import org.bukkit.entity.Player
import org.bukkit.plugin.java.JavaPlugin
class AntigriefFabledSkyBlock : AntigriefIntegration { class AntigriefFabledSkyBlock : AntigriefIntegration {
private val skyblock = JavaPlugin.getPlugin(SkyBlock::class.java)
override fun getPluginName(): String { override fun getPluginName(): String {
return "FabledSkyBlock" return "FabledSkyBlock"
} }
override fun canBreakBlock(player: Player, block: Block): Boolean { override fun canBreakBlock(player: Player, block: Block): Boolean {
val skyblock = SkyBlock.getInstance()
val island = skyblock.islandManager.getIslandAtLocation(block.location) ?: return true val island = skyblock.islandManager.getIslandAtLocation(block.location) ?: return true
if (player.hasPermission("fabledskyblock.bypass.destroy")) { if (player.hasPermission("fabledskyblock.bypass.destroy")) {
@@ -29,7 +31,6 @@ class AntigriefFabledSkyBlock : AntigriefIntegration {
} }
override fun canCreateExplosion(player: Player, location: Location): Boolean { override fun canCreateExplosion(player: Player, location: Location): Boolean {
val skyblock = SkyBlock.getInstance()
val island = skyblock.islandManager.getIslandAtLocation(location) ?: return true val island = skyblock.islandManager.getIslandAtLocation(location) ?: return true
if (player.hasPermission("fabledskyblock.bypass.explosions")) { if (player.hasPermission("fabledskyblock.bypass.explosions")) {
@@ -44,7 +45,6 @@ class AntigriefFabledSkyBlock : AntigriefIntegration {
} }
override fun canPlaceBlock(player: Player, block: Block): Boolean { override fun canPlaceBlock(player: Player, block: Block): Boolean {
val skyblock = SkyBlock.getInstance()
val island = skyblock.islandManager.getIslandAtLocation(block.location) ?: return true val island = skyblock.islandManager.getIslandAtLocation(block.location) ?: return true
if (player.hasPermission("fabledskyblock.bypass.place")) { if (player.hasPermission("fabledskyblock.bypass.place")) {
@@ -59,8 +59,7 @@ class AntigriefFabledSkyBlock : AntigriefIntegration {
} }
override fun canInjure(player: Player, victim: LivingEntity): Boolean { override fun canInjure(player: Player, victim: LivingEntity): Boolean {
val skyblock = SkyBlock.getInstance() val island = skyblock.islandManager.getIslandAtLocation(victim.location) ?: return true
val island = SkyBlock.getInstance().islandManager.getIslandAtLocation(victim.location) ?: return true
if (victim is Player) return skyblock.permissionManager.hasPermission(island, "PvP", island.getRole(player)) if (victim is Player) return skyblock.permissionManager.hasPermission(island, "PvP", island.getRole(player))
@@ -77,8 +76,7 @@ class AntigriefFabledSkyBlock : AntigriefIntegration {
} }
override fun canPickupItem(player: Player, location: Location): Boolean { override fun canPickupItem(player: Player, location: Location): Boolean {
val skyblock = SkyBlock.getInstance() val island = skyblock.islandManager.getIslandAtLocation(location) ?: return true
val island = SkyBlock.getInstance().islandManager.getIslandAtLocation(location) ?: return true
if (player.hasPermission("fabledskyblock.bypass.itempickup")) { if (player.hasPermission("fabledskyblock.bypass.itempickup")) {
return true return true

Binary file not shown.

BIN
lib/fabledskyblock3.jar Normal file

Binary file not shown.