Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt
  • Loading branch information
@WillFP
WillFP committed Feb 1, 2025
2 parents af5a325 + 69d2155 commit 48ca422
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 37 deletions.
4 changes: 2 additions & 2 deletions eco-core/core-plugin/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ dependencies {
exclude(group = "*", module = "*")
}
compileOnly("com.iridium:IridiumSkyblock:4.0.8")
compileOnly("net.william278.huskclaims:huskclaims-bukkit:1.0.1")
compileOnly("net.william278:husktowns:2.6.1")
compileOnly("net.william278.huskclaims:huskclaims-bukkit:1.5")
compileOnly("net.william278.husktowns:husktowns-bukkit:3.0.8")
compileOnly("com.github.jojodmo:ItemBridge:b0054538c1")
compileOnly("de.oliver:FancyHolograms:2.4.0")

Expand Down
46 changes: 23 additions & 23 deletions .../main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.willfp.eco.internal.spigot.integrations.antigrief

import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration
import net.william278.huskclaims.api.HuskClaimsAPI
import net.william278.huskclaims.api.BukkitHuskClaimsAPI
import net.william278.huskclaims.libraries.cloplib.operation.Operation
import net.william278.huskclaims.libraries.cloplib.operation.OperationType
import net.william278.huskclaims.position.Position
Expand All @@ -16,19 +16,19 @@ class AntigriefHuskClaims : AntigriefIntegration {
player: Player,
block: Block
): Boolean {
val api = HuskClaimsAPI.getInstance() ?: return true
val api = BukkitHuskClaimsAPI.getInstance() ?: return true

val user = api.getOnlineUser(player.uniqueId) ?: return true
val user = api.getOnlineUser(player) ?: return true

return api.isOperationAllowed(
Operation.of(
user,
OperationType.BLOCK_BREAK,
Position.at(
block.x.toDouble(),
block.y.toDouble(),
block.z.toDouble(),
api.getWorld(block.location.world.name)
block.location.x,
block.location.y,
block.location.z,
api.getWorld(block.world)
),
true
)
Expand All @@ -39,9 +39,9 @@ class AntigriefHuskClaims : AntigriefIntegration {
player: Player,
location: Location
): Boolean {
val api = HuskClaimsAPI.getInstance() ?: return true
val api = BukkitHuskClaimsAPI.getInstance() ?: return true

val user = api.getOnlineUser(player.uniqueId) ?: return true
val user = api.getOnlineUser(player) ?: return true

return api.isOperationAllowed(
Operation.of(
Expand All @@ -51,7 +51,7 @@ class AntigriefHuskClaims : AntigriefIntegration {
location.x,
location.y,
location.z,
api.getWorld(location.world.name)
api.getWorld(location.world)
),
true
)
Expand All @@ -62,19 +62,19 @@ class AntigriefHuskClaims : AntigriefIntegration {
player: Player,
block: Block
): Boolean {
val api = HuskClaimsAPI.getInstance() ?: return true
val api = BukkitHuskClaimsAPI.getInstance() ?: return true

val user = api.getOnlineUser(player.uniqueId) ?: return true
val user = api.getOnlineUser(player) ?: return true

return api.isOperationAllowed(
Operation.of(
user,
OperationType.BLOCK_PLACE,
Position.at(
block.x.toDouble(),
block.y.toDouble(),
block.z.toDouble(),
api.getWorld(block.location.world.name)
block.location.x,
block.location.y,
block.location.z,
api.getWorld(block.world)
),
true
)
Expand All @@ -85,23 +85,23 @@ class AntigriefHuskClaims : AntigriefIntegration {
player: Player,
victim: LivingEntity
): Boolean {
val api = HuskClaimsAPI.getInstance() ?: return true
val api = BukkitHuskClaimsAPI.getInstance() ?: return true

val user = api.getOnlineUser(player.uniqueId) ?: return true
val user = api.getOnlineUser(player) ?: return true

return api.isOperationAllowed(
Operation.of(
user,
when (victim) {
when(victim) {
is Monster -> OperationType.PLAYER_DAMAGE_MONSTER
is Player -> OperationType.PLAYER_DAMAGE_PLAYER
else -> OperationType.PLAYER_DAMAGE_ENTITY
},
Position.at(
victim.x,
victim.y,
victim.z,
api.getWorld(victim.location.world.name)
player.location.x,
player.location.y,
player.location.z,
api.getWorld(player.world)
),
true
)
Expand Down
25 changes: 13 additions & 12 deletions ...c/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskTowns.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.willfp.eco.internal.spigot.integrations.antigrief

import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration
import net.william278.husktowns.api.HuskTownsAPI
import net.william278.husktowns.api.BukkitHuskTownsAPI
import net.william278.husktowns.claim.Position
import net.william278.husktowns.listener.Operation
import net.william278.husktowns.libraries.cloplib.operation.Operation
import net.william278.husktowns.libraries.cloplib.operation.OperationType
import org.bukkit.Location
import org.bukkit.block.Block
import org.bukkit.entity.LivingEntity
Expand All @@ -15,14 +16,14 @@ class AntigriefHuskTowns : AntigriefIntegration {
player: Player,
block: Block
): Boolean {
val api = HuskTownsAPI.getInstance() ?: return true
val api = BukkitHuskTownsAPI.getInstance() ?: return true

val user = api.getOnlineUser(player) ?: return true

return api.isOperationAllowed(
Operation.of(
user,
Operation.Type.BLOCK_BREAK,
OperationType.BLOCK_BREAK,
Position.at(
block.location.x,
block.location.y,
Expand All @@ -38,14 +39,14 @@ class AntigriefHuskTowns : AntigriefIntegration {
player: Player,
location: Location
): Boolean {
val api = HuskTownsAPI.getInstance() ?: return true
val api = BukkitHuskTownsAPI.getInstance() ?: return true

val user = api.getOnlineUser(player) ?: return true

return api.isOperationAllowed(
Operation.of(
user,
Operation.Type.EXPLOSION_DAMAGE_ENTITY,
OperationType.EXPLOSION_DAMAGE_ENTITY,
Position.at(
location.x,
location.y,
Expand All @@ -61,14 +62,14 @@ class AntigriefHuskTowns : AntigriefIntegration {
player: Player,
block: Block
): Boolean {
val api = HuskTownsAPI.getInstance() ?: return true
val api = BukkitHuskTownsAPI.getInstance() ?: return true

val user = api.getOnlineUser(player) ?: return true

return api.isOperationAllowed(
Operation.of(
user,
Operation.Type.BLOCK_PLACE,
OperationType.BLOCK_PLACE,
Position.at(
block.location.x,
block.location.y,
Expand All @@ -84,17 +85,17 @@ class AntigriefHuskTowns : AntigriefIntegration {
player: Player,
victim: LivingEntity
): Boolean {
val api = HuskTownsAPI.getInstance() ?: return true
val api = BukkitHuskTownsAPI.getInstance() ?: return true

val user = api.getOnlineUser(player) ?: return true

return api.isOperationAllowed(
Operation.of(
user,
when(victim) {
is Monster -> Operation.Type.PLAYER_DAMAGE_MONSTER
is Player -> Operation.Type.PLAYER_DAMAGE_PLAYER
else -> Operation.Type.PLACE_HANGING_ENTITY
is Monster -> OperationType.PLAYER_DAMAGE_MONSTER
is Player -> OperationType.PLAYER_DAMAGE_PLAYER
else -> OperationType.PLACE_HANGING_ENTITY
},
Position.at(
player.location.x,
Expand Down

0 comments on commit 48ca422

Please sign in to comment.